Add extra error check to GetImageBlob and GetImagesBlob before freein…

…g memory (refs #329)
gographics · Dec 16, 2024 · e0231e9 · e0231e9
1 parent c974483
commit e0231e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
 module gopkg.in/gographics/imagick.v3
 
-go 1.13
+go 1.22
diff --git a/imagick/magick_wand_image.go b/imagick/magick_wand_image.go
@@ -940,6 +940,9 @@ func (mw *MagickWand) GetImageBackgroundColor() (bgColor *PixelWand, err error)
 func (mw *MagickWand) GetImageBlob() ([]byte, error) {
 	clen := C.size_t(0)
 	csblob := C.MagickGetImageBlob(mw.mw, &clen)
+	if err := mw.GetLastError(); csblob == nil && err != nil {
+		return nil, err
+	}
 	defer relinquishMemory(unsafe.Pointer(csblob))
 	ret := C.GoBytes(unsafe.Pointer(csblob), C.int(clen))
 	runtime.KeepAlive(mw)
@@ -958,6 +961,9 @@ func (mw *MagickWand) GetImageBlob() ([]byte, error) {
 func (mw *MagickWand) GetImagesBlob() ([]byte, error) {
 	clen := C.size_t(0)
 	csblob := C.MagickGetImagesBlob(mw.mw, &clen)
+	if err := mw.GetLastError(); csblob == nil && err != nil {
+		return nil, err
+	}
 	defer relinquishMemory(unsafe.Pointer(csblob))
 	ret := C.GoBytes(unsafe.Pointer(csblob), C.int(clen))
 	runtime.KeepAlive(mw)