]> granicus.if.org Git - imagemagick/commitdiff
fix multiple null pointer
authorroot <356986351@qq.com>
Thu, 28 Sep 2017 17:39:04 +0000 (17:39 +0000)
committerDirk Lemstra <dlemstra@users.noreply.github.com>
Thu, 28 Sep 2017 19:11:13 +0000 (21:11 +0200)
coders/art.c
coders/bgr.c
coders/cmyk.c
coders/dpx.c
coders/pgx.c
coders/rgb.c
coders/ycbcr.c

index e9a1fce5eda5024a4dbdf0d706cba4044ff63964..55f3515f4cd21832383cb0a58b3a58b3fcb9f982 100644 (file)
@@ -325,7 +325,7 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image,
   (void) WriteBlobLSBShort(image,0);
   (void) WriteBlobLSBShort(image,(unsigned short) image->rows);
   quantum_info=AcquireQuantumInfo(image_info,image);
-  if(quantum_info == (QuantumInfo *)NULL)
+  if(quantum_info == (QuantumInfo *) NULL)
     ThrowWriterException(ImageError,"MemoryAllocationFailed");
   pixels=(unsigned char *) GetQuantumPixels(quantum_info);
   for (y=0; y < (ssize_t) image->rows; y++)
index fa08e587188c1ba10331a3d68f142058212c6b46..2d6da144765741de4221b51bd486b6a986a87d61 100644 (file)
@@ -159,7 +159,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  if(canvas_image == (Image *)NULL)
+  if(canvas_image == (Image *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
     exception);
index c0ceb9760b8f22fda0ad3ea6972e5d1f9bbeb1d2..2b52f04bbc70081912c69397a1e31dd7f882619d 100644 (file)
@@ -162,7 +162,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  if(canvas_image == (Image *)NULL)
+  if(canvas_image == (Image *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
     exception);
index d32028bafec711d963c16a0052e0bd4bd5c65e29..b78c6f60c4ebdbf9afd2b851d0f4c57cc376907c 100644 (file)
@@ -1969,7 +1969,7 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
     Convert pixel packets to DPX raster image.
   */
   quantum_info=AcquireQuantumInfo(image_info,image);
-  if(quantum_info == (QuantumInfo *)NULL)
+  if(quantum_info == (QuantumInfo *) NULL)
     ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
   SetQuantumQuantum(quantum_info,32);
   SetQuantumPack(quantum_info,dpx.image.image_element[0].packing == 0 ?
index 918da9281257460e29a021939266c9a16fa941ff..7381848167bca80685929ffb53b603e21cfed036 100644 (file)
@@ -366,7 +366,7 @@ static MagickBooleanType WritePGXImage(const ImageInfo *image_info,Image *image,
   (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer);
   (void) TransformImageColorspace(image,sRGBColorspace,exception);
   quantum_info=AcquireQuantumInfo(image_info,image);
-  if(quantum_info == (QuantumInfo *)NULL)
+  if(quantum_info == (QuantumInfo *) NULL)
     ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
   pixels=(unsigned char *) GetQuantumPixels(quantum_info);
   for (y=0; y < (ssize_t) image->rows; y++)
index 81f58ab4b7225469767b08c5fb86574b52c1d1d7..a81789a6306f36db5c6b0747c186a78d745715e8 100644 (file)
@@ -158,7 +158,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  if(canvas_image == (Image *)NULL)
+  if(canvas_image == (Image *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
     exception);
index 88614d1095703f2c3bb03680ccf18387619ffb59..066ef46d907c7965604e111008558c27021e3f4b 100644 (file)
@@ -169,7 +169,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  if(canvas_image == (Image *)NULL)
+  if(canvas_image == (Image *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
     exception);