diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-08-18 11:28:06 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-18 11:28:06 +0000 |
| commit | 5329f234ba950fdde6f04c239f8f9f172e4a3afa (patch) | |
| tree | ab639f706acce5303ab1c53c39b3ac7a244a145b | |
| parent | 2cc82ef66058a428a1192dc10040336bb047bb48 (diff) | |
| parent | 91b10dd79912b92de5b16a2ea6e2769876fe13fa (diff) | |
Merge pull request #1795 from kext/msos-multisz-terminator
embassy-usb: Fixed the final null terminator for RegMultiSz.
| -rw-r--r-- | embassy-usb/src/msos.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/embassy-usb/src/msos.rs b/embassy-usb/src/msos.rs index 187b2ff8e..847338e5f 100644 --- a/embassy-usb/src/msos.rs +++ b/embassy-usb/src/msos.rs | |||
| @@ -526,7 +526,7 @@ impl<'a> PropertyData<'a> { | |||
| 526 | PropertyData::Binary(val) => val.len(), | 526 | PropertyData::Binary(val) => val.len(), |
| 527 | PropertyData::DwordLittleEndian(val) | PropertyData::DwordBigEndian(val) => core::mem::size_of_val(val), | 527 | PropertyData::DwordLittleEndian(val) | PropertyData::DwordBigEndian(val) => core::mem::size_of_val(val), |
| 528 | PropertyData::RegMultiSz(val) => { | 528 | PropertyData::RegMultiSz(val) => { |
| 529 | core::mem::size_of::<u16>() * val.iter().map(|x| x.encode_utf16().count() + 1).sum::<usize>() + 1 | 529 | core::mem::size_of::<u16>() * (val.iter().map(|x| x.encode_utf16().count() + 1).sum::<usize>() + 1) |
| 530 | } | 530 | } |
| 531 | } | 531 | } |
| 532 | } | 532 | } |
