Merge pull request #12 from sunrise-choir/fix_unsoundness

Ensure buffer is zeroed for reading
sunrise-choir · Jan 13, 2022 · 14b7440 · 14b7440
2 parents 65084dd + 1b643df
commit 14b7440
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/go_offset_log.rs b/src/go_offset_log.rs
@@ -215,8 +215,7 @@ where
 {
     // Entry is [payload size: u64, payload ]
 
-    let mut buf = Vec::with_capacity(frame.data_size);
-    unsafe { buf.set_len(frame.data_size) };
+    let mut buf = vec![0; frame.data_size];
 
     let n = read_at(&mut buf, frame.data_start())?;
     if n < frame.data_size {

diff --git a/src/offset_log.rs b/src/offset_log.rs
@@ -335,8 +335,7 @@ where
     let tail_size = size_of_frame_tail::<ByteType>();
     let to_read = frame.data_size + tail_size;
 
-    let mut buf = Vec::with_capacity(to_read);
-    unsafe { buf.set_len(to_read) };
+    let mut buf = vec![0; to_read];
 
     let n = read_at(&mut buf, frame.data_start())?;
     if n < to_read {
@@ -353,7 +352,7 @@ where
             offset: frame.offset,
             data: buf,
         },
-        next: next,
+        next,
     })
 }