From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 22 Jan 2013 18:09:41 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4385
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7f2d71055440643d07893dcef830f932d6cff8a;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index b0f354aaf..43480f998 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -574,6 +574,9 @@ static MagickBooleanType ClonePixelCacheRepository(CacheInfo *clone_info,
     const int
       id = GetOpenMPThreadId();
 
+    Quantum
+      *pixels;
+
     RectangleInfo
       region;
 
@@ -588,15 +591,19 @@ static MagickBooleanType ClonePixelCacheRepository(CacheInfo *clone_info,
     region.height=1;
     region.x=0;
     region.y=y;
-    (void) SetPixelCacheNexusPixels(cache_info,ReadMode,&region,cache_nexus[id],
+    pixels=SetPixelCacheNexusPixels(cache_info,ReadMode,&region,cache_nexus[id],
       exception);
+    if (pixels == (Quantum *) NULL)
+      continue;
     status=ReadPixelCachePixels(cache_info,cache_nexus[id],exception);
     if (status == MagickFalse)
       continue;
     region.width=clone_info->columns;
     region.y=y;
-    (void) SetPixelCacheNexusPixels(clone_info,WriteMode,&region,
+    pixels=SetPixelCacheNexusPixels(clone_info,WriteMode,&region,
       clone_nexus[id],exception);
+    if (pixels == (Quantum *) NULL)
+      continue;
     if (optimize != MagickFalse)
       (void) memcpy(clone_nexus[id]->pixels,cache_nexus[id]->pixels,length*
         sizeof(Quantum));
@@ -653,6 +660,9 @@ static MagickBooleanType ClonePixelCacheRepository(CacheInfo *clone_info,
         const int
           id = GetOpenMPThreadId();
 
+        Quantum
+          *pixels;
+
         RectangleInfo
           region;
 
@@ -664,15 +674,19 @@ static MagickBooleanType ClonePixelCacheRepository(CacheInfo *clone_info,
         region.height=1;
         region.x=0;
         region.y=y;
-        (void) SetPixelCacheNexusPixels(cache_info,ReadMode,&region,
+        pixels=SetPixelCacheNexusPixels(cache_info,ReadMode,&region,
           cache_nexus[id],exception);
+        if (pixels == (Quantum *) NULL)
+          continue;
         status=ReadPixelCacheMetacontent(cache_info,cache_nexus[id],exception);
         if (status == MagickFalse)
           continue;
         region.width=clone_info->columns;
         region.y=y;
-        (void) SetPixelCacheNexusPixels(clone_info,WriteMode,&region,
+        pixels=SetPixelCacheNexusPixels(clone_info,WriteMode,&region,
           clone_nexus[id],exception);
+        if (pixels == (Quantum *) NULL)
+          continue;
         (void) memcpy(clone_nexus[id]->metacontent,cache_nexus[id]->metacontent,
           length*sizeof(*cache_nexus[id]->metacontent));
         status=WritePixelCacheMetacontent(clone_info,clone_nexus[id],exception);