From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 23 Apr 2012 15:33:05 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5745
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e04362f7ecf119f6d882d85ff9f6e766abe22171;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 663d0e54a..720143cac 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -900,25 +900,26 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info,
     }
     length=clone_info->number_channels*sizeof(Quantum);
     (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
-    for ( ; x < (ssize_t) clone_info->columns; x++)
-    {
-      /*
-        Set remaining columns as undefined.
-      */
-      if (clone_info->type != DiskCache)
-        (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,blob,
-          length);
-      else
-        {
-          count=WritePixelCacheRegion(clone_info,clone_offset,length,blob);
-          if ((MagickSizeType) count != length)
-            {
-              status=MagickFalse;
-              break;
-            }
-        }
-      clone_offset+=length;
-    }
+    if (y < clone_info->rows)
+      for ( ; x < (ssize_t) clone_info->columns; x++)
+      {
+        /*
+          Set remaining columns as undefined.
+        */
+        if (clone_info->type != DiskCache)
+          (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,blob,
+            length);
+        else
+          {
+            count=WritePixelCacheRegion(clone_info,clone_offset,length,blob);
+            if ((MagickSizeType) count != length)
+              {
+                status=MagickFalse;
+                break;
+              }
+          }
+        clone_offset+=length;
+      }
   }
   length=clone_info->number_channels*sizeof(Quantum);
   (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
@@ -1016,28 +1017,30 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info,
       }
       length=clone_info->metacontent_extent;
       (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
-      for ( ; y < (ssize_t) clone_info->rows; y++)
-      {
-        /*
-          Set remaining rows as undefined.
-        */
-        for (x=0; x < (ssize_t) clone_info->columns; x++)
+      if (y < clone_info->rows)
+        for ( ; y < (ssize_t) clone_info->rows; y++)
         {
-          if (clone_info->type != DiskCache)
-            (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
-              blob,length);
-          else
-            {
-              count=WritePixelCacheRegion(clone_info,clone_offset,length,blob);
-              if ((MagickSizeType) count != length)
-                {
-                  status=MagickFalse;
-                  break;
-                }
-            }
-          clone_offset+=length;
+          /*
+            Set remaining rows as undefined.
+          */
+          for (x=0; x < (ssize_t) clone_info->columns; x++)
+          {
+            if (clone_info->type != DiskCache)
+              (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
+                blob,length);
+            else
+              {
+                count=WritePixelCacheRegion(clone_info,clone_offset,length,
+                  blob);
+                if ((MagickSizeType) count != length)
+                  {
+                    status=MagickFalse;
+                    break;
+                  }
+              }
+            clone_offset+=length;
+          }
         }
-      }
     }
   if (clone_info->type == DiskCache)
     (void) ClosePixelCacheOnDisk(clone_info);