pe: fix unbound access to bytes slice at im pe/debug.rs:172

m4b · Sep 12, 2022 · cb19f3b · cb19f3b
1 parent f9c3448
commit cb19f3b
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/pe/debug.rs b/src/pe/debug.rs
@@ -169,13 +169,18 @@ impl<'a> CodeviewPDB70DebugInfo<'a> {
         let mut signature: [u8; 16] = [0; 16];
         signature.copy_from_slice(bytes.gread_with(&mut offset, 16)?);
         let age: u32 = bytes.gread_with(&mut offset, scroll::LE)?;
-        let filename = &bytes[offset..offset + filename_length];
-
-        Ok(Some(CodeviewPDB70DebugInfo {
-            codeview_signature,
-            signature,
-            age,
-            filename,
-        }))
+        if let Some(filename) = bytes.get(offset..offset + filename_length) {
+            Ok(Some(CodeviewPDB70DebugInfo {
+                codeview_signature,
+                signature,
+                age,
+                filename,
+            }))
+        } else {
+            Err(error::Error::Malformed(format!(
+                "ImageDebugDirectory seems corrupted: {:?}",
+                idd
+            )))
+        }
     }
 }