commit 67c2457c9a09c5276d4f6e3c19f194c0ec66b1d4
author root <356986351@qq.com> Thu Sep 28 16:57:54 2017 +0000
committer Dirk Lemstra <dlemstra@users.noreply.github.com> Thu Sep 28 21:11:13 2017 +0200
tree aaa9baefd0bd83232089e91dfbd19a28ecc23d03
parent ba78ae311632fe205baa5eefe60345d41b95acec

fix multiple null pointer

coders/art.c

diff --git a/coders/art.c b/coders/art.c
index f960832..02b736a 100644
--- a/coders/art.c
+++ b/coders/art.c
@@ -325,6 +325,8 @@
   (void) WriteBlobLSBShort(image,0);
   (void) WriteBlobLSBShort(image,(unsigned short) image->rows);
   quantum_info=AcquireQuantumInfo(image_info,image);
+  if(quantum_info==NULL)
+    ThrowWriterException(ImageError,"MemoryAllocationFailed");
   pixels=(unsigned char *) GetQuantumPixels(quantum_info);
   for (y=0; y < (ssize_t) image->rows; y++)
   {

coders/bgr.c

diff --git a/coders/bgr.c b/coders/bgr.c
index 52d1d7a..fc88bd7 100644
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -159,6 +159,8 @@
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
+  if(canvas_image==NULL)
+    ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
     exception);
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);

coders/cmyk.c

diff --git a/coders/cmyk.c b/coders/cmyk.c
index 21c84e4..5c0789b 100644
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -162,6 +162,8 @@
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
+  if(canvas_image==NULL)
+    ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
     exception);
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);

coders/dpx.c

diff --git a/coders/dpx.c b/coders/dpx.c
index aebadda..be208d3 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1969,6 +1969,8 @@
     Convert pixel packets to DPX raster image.
   */
   quantum_info=AcquireQuantumInfo(image_info,image);
+  if(quantum_info==NULL)
+    ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
   SetQuantumQuantum(quantum_info,32);
   SetQuantumPack(quantum_info,dpx.image.image_element[0].packing == 0 ?
     MagickTrue : MagickFalse);

coders/pgx.c

diff --git a/coders/pgx.c b/coders/pgx.c
index a47425e..ff35d74 100644
--- a/coders/pgx.c
+++ b/coders/pgx.c
@@ -366,6 +366,8 @@
   (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
   (void) TransformImageColorspace(image,sRGBColorspace,exception);
   quantum_info=AcquireQuantumInfo(image_info,image);
+  if(quantum_info==NULL)
+    ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
   pixels=(unsigned char *) GetQuantumPixels(quantum_info);
   for (y=0; y < (ssize_t) image->rows; y++)
   {

coders/rgb.c

diff --git a/coders/rgb.c b/coders/rgb.c
index 2d1e0f1..6c5cf24 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -158,6 +158,8 @@
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
+  if(canvas_image==NULL)
+    ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
     exception);
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);

coders/ycbcr.c

diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index 946e5e1..ff9cb45 100644
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -169,6 +169,8 @@
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
+  if(canvas_image==NULL)
+    ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
     exception);
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);