Avoid UB if the CFData pointer is NULL (#688)

servo · Jul 14, 2024 · 3570256 · 3570256
1 parent 8002ddd
commit 3570256
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core-foundation/src/data.rs b/core-foundation/src/data.rs
@@ -81,7 +81,14 @@ impl CFData {
     /// read-only.
     #[inline]
     pub fn bytes(&self) -> &[u8] {
-        unsafe { slice::from_raw_parts(CFDataGetBytePtr(self.0), self.len() as usize) }
+        unsafe {
+            let ptr = CFDataGetBytePtr(self.0);
+            // Rust slice must never have a NULL pointer
+            if ptr.is_null() {
+                return &[];
+            }
+            slice::from_raw_parts(ptr, self.len() as usize)
+        }
     }
 
     /// Returns the length of this byte buffer.