From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 11 Dec 2012 17:27:01 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4621
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8be60e90263feba98207908365c9063373aca346;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 82257e048..7964a1554 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -1209,12 +1209,14 @@ static inline void RelinquishPixelCachePixels(CacheInfo *cache_info)
     {
       cache_info->pixels=(Quantum *) UnmapBlob(cache_info->pixels,(size_t)
         cache_info->length);
+      (void) RelinquishUniqueFileResource(cache_info->cache_filename);
       RelinquishMagickResource(MapResource,cache_info->length);
     }
     case DiskCache:
     {
       if (cache_info->file != -1)
         (void) ClosePixelCacheOnDisk(cache_info);
+      (void) RelinquishUniqueFileResource(cache_info->cache_filename);
       RelinquishMagickResource(DiskResource,cache_info->length);
       break;
     }
@@ -1255,8 +1257,6 @@ MagickPrivate Cache DestroyPixelCache(Cache cache)
       (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
     }
   RelinquishPixelCachePixels(cache_info);
-  if ((cache_info->type == MapCache) || (cache_info->type == DiskCache))
-    (void) RelinquishUniqueFileResource(cache_info->cache_filename);
   *cache_info->cache_filename='\0';
   if (cache_info->nexus_info != (NexusInfo **) NULL)
     cache_info->nexus_info=DestroyPixelCacheNexus(cache_info->nexus_info,
@@ -3911,8 +3911,6 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
     {
       status=ClonePixelCachePixels(cache_info,&source_info,exception);
       RelinquishPixelCachePixels(&source_info);
-      if ((source_info.type == MapCache) || (source_info.type == DiskCache))
-        (void) RelinquishUniqueFileResource(source_info.cache_filename);
     }
   if (image->debug != MagickFalse)
     {