From fa18e626bfb0f8953c8393f3252cbc3f0e07c80c Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 18 May 2014 17:37:00 +0000 Subject: [PATCH] --- MagickCore/xwindow.c | 9 +++------ coders/cut.c | 2 ++ coders/scr.c | 2 ++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index a9ec377c4..29a1907c5 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -5614,12 +5614,9 @@ MagickPrivate MagickBooleanType XMakeImage(Display *display, window->shared_memory=MagickFalse; if (status != False) XShmDetach(display,&segment_info[1]); - if (ximage != (XImage *) NULL) - { - ximage->data=NULL; - XDestroyImage(ximage); - ximage=(XImage *) NULL; - } + ximage->data=NULL; + XDestroyImage(ximage); + ximage=(XImage *) NULL; if (segment_info[1].shmid >= 0) { if (segment_info[1].shmaddr != NULL) diff --git a/coders/cut.c b/coders/cut.c index d09af03aa..855b3a9b7 100644 --- a/coders/cut.c +++ b/coders/cut.c @@ -248,6 +248,8 @@ static int GetCutColors(Image *image,ExceptionInfo *exception) for (y=0; y < (ssize_t) image->rows; y++) { q=GetAuthenticPixels(image,0,y,image->columns,1,exception); + if (q == (Quantum *) NULL) + break; for (x=0; x < (ssize_t) image->columns; x++) { if (intensity < GetPixelRed(image,q)) diff --git a/coders/scr.c b/coders/scr.c index 0ad58ec73..83899923d 100644 --- a/coders/scr.c +++ b/coders/scr.c @@ -213,6 +213,8 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception) for(z=7;z>-1;z--) { q=QueueAuthenticPixels(image,pix,piy,1,1,exception); + if (q == (Quantum *) NULL) + break; if(binar[z]) { -- 2.40.0