From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 7 Aug 2017 23:00:45 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/655
X-Git-Tag: 7.0.6-6~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03e8b3089e4631d080ba9c09205908b53eafbcb4;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/655
---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 813067bac..0407ff46b 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3861,9 +3861,9 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
     Clone persistent pixel cache.
   */
   clone_info=ClonePixelCache(cache_info);
+  clone_info->type=DiskCache;
+  (void) CopyMagickString(clone_info->cache_filename,filename,MagickPathExtent);
   clone_info->file=(-1);
-  (void) CopyMagickString(clone_info->filename,cache_info->filename,
-    MagickPathExtent);
   clone_info->storage_class=cache_info->storage_class;
   clone_info->colorspace=cache_info->colorspace;
   clone_info->alpha_trait=cache_info->alpha_trait;
@@ -3873,12 +3873,10 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
   clone_info->columns=cache_info->columns;
   clone_info->number_channels=cache_info->number_channels;
   clone_info->metacontent_extent=cache_info->metacontent_extent;
-  clone_info->mode=cache_info->mode;
+  clone_info->mode=PersistMode;
   clone_info->length=cache_info->length;
   (void) memcpy(clone_info->channel_map,cache_info->channel_map,
     MaxPixelChannels*sizeof(*cache_info->channel_map));
-  clone_info->mode=PersistMode;
-  clone_info->type=DiskCache;
   clone_info->offset=(*offset);
   status=ClonePixelCacheRepository(clone_info,cache_info,exception);
   *offset+=cache_info->length+page_size-(cache_info->length % page_size);