don't segfault if MagickGetImageBlob returns null

nlfiedler · Apr 7, 2023 · c8fdace · c8fdace
1 parent 1cfbc83
commit c8fdace
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/wand/magick.rs b/src/wand/magick.rs
@@ -831,13 +831,17 @@ impl MagickWand {
             bindings::MagickSetImageFormat(self.wand, c_format.as_ptr());
             bindings::MagickGetImageBlob(self.wand, &mut length)
         };
-        let mut bytes = Vec::with_capacity(length as usize);
-        unsafe {
-            bytes.set_len(length as usize);
-            ptr::copy_nonoverlapping(blob, bytes.as_mut_ptr(), length as usize);
-            bindings::MagickRelinquishMemory(blob as *mut c_void);
-        };
-        Ok(bytes)
+        if blob.is_null() {
+            Err(MagickError("failed to write image blob"))
+        } else {
+            let mut bytes = Vec::with_capacity(length as usize);
+            unsafe {
+                bytes.set_len(length as usize);
+                ptr::copy_nonoverlapping(blob, bytes.as_mut_ptr(), length as usize);
+                bindings::MagickRelinquishMemory(blob as *mut c_void);
+            };
+            Ok(bytes)
+        }
     }
 
     /// Write the images in the desired format to a new blob.