summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-02-07 10:04:09 +0100
committerDavid Lönnhager <david.l@mullvad.net>2022-02-07 10:04:09 +0100
commit02ef35f4529af3de684200084196b2fc28539bd0 (patch)
treefa1ebd1c37907da9369b8a2bdca000369801739d
parent34ef9abe2e192a9da518c7f10c86a77283fd3ec2 (diff)
parent70157d854ece323468f3e6f2babbec6c8893d9b5 (diff)
downloadmullvadvpn-02ef35f4529af3de684200084196b2fc28539bd0.tar.xz
mullvadvpn-02ef35f4529af3de684200084196b2fc28539bd0.zip
Merge branch 'win-fix-warning'
-rw-r--r--talpid-core/src/split_tunnel/windows/driver.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/talpid-core/src/split_tunnel/windows/driver.rs b/talpid-core/src/split_tunnel/windows/driver.rs
index 38bb7b8eab..a8d6faddf9 100644
--- a/talpid-core/src/split_tunnel/windows/driver.rs
+++ b/talpid-core/src/split_tunnel/windows/driver.rs
@@ -945,10 +945,16 @@ pub unsafe fn deserialize_buffer<T: Sized>(buffer: &Vec<u8>) -> T {
instance
}
+/// Inserts a string into `buffer` at a given `byte_offset`.
+///
+/// # Panics
+///
+/// This panics if either `byte_offset` or `byte_offset + 2 * string.len() - 1` is
+/// an out of bounds index for `buffer`.
fn write_string_to_buffer(buffer: &mut [MaybeUninit<u8>], byte_offset: usize, string: &[u16]) {
for (i, byte) in string
.iter()
- .flat_map(|word| std::array::IntoIter::new(word.to_ne_bytes()))
+ .flat_map(|word| word.to_ne_bytes().into_iter())
.enumerate()
{
buffer[byte_offset + i] = MaybeUninit::new(byte);