From: root <356986351@qq.com> Date: Thu, 28 Sep 2017 17:39:04 +0000 (+0000) Subject: fix multiple null pointer X-Git-Tag: 7.0.7-5~45 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a851d3b321fbd527bed4986bb7922cf531823f8;p=imagemagick fix multiple null pointer --- diff --git a/coders/art.c b/coders/art.c index e9a1fce5e..55f3515f4 100644 --- a/coders/art.c +++ b/coders/art.c @@ -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++) diff --git a/coders/bgr.c b/coders/bgr.c index fa08e5871..2d6da1447 100644 --- a/coders/bgr.c +++ b/coders/bgr.c @@ -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); diff --git a/coders/cmyk.c b/coders/cmyk.c index c0ceb9760..2b52f04bb 100644 --- a/coders/cmyk.c +++ b/coders/cmyk.c @@ -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); diff --git a/coders/dpx.c b/coders/dpx.c index d32028baf..b78c6f60c 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -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 ? diff --git a/coders/pgx.c b/coders/pgx.c index 918da9281..738184816 100644 --- a/coders/pgx.c +++ b/coders/pgx.c @@ -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++) diff --git a/coders/rgb.c b/coders/rgb.c index 81f58ab4b..a81789a63 100644 --- a/coders/rgb.c +++ b/coders/rgb.c @@ -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); diff --git a/coders/ycbcr.c b/coders/ycbcr.c index 88614d109..066ef46d9 100644 --- a/coders/ycbcr.c +++ b/coders/ycbcr.c @@ -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);