From cc962acde80b4589f8c2105440c2209d9f000ba0 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 10 Jun 2018 19:18:29 -0400 Subject: [PATCH] Close pixel cache before time limit exceeded --- MagickCore/cache.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 50d877e98..a3d580749 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -1700,6 +1700,9 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone, #if defined(ECANCELED) errno=ECANCELED; #endif + cache_info=(CacheInfo *) image->cache; + if (cache_info->file != -1) + (void) ClosePixelCacheOnDisk(cache_info); ThrowFatalException(ResourceLimitFatalError,"TimeLimitExceeded"); } LockSemaphoreInfo(image->semaphore); @@ -1760,7 +1763,7 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone, { status=OpenPixelCache(image,IOMode,exception); cache_info=(CacheInfo *) image->cache; - if (cache_info->type == DiskCache) + if (cache_info->file != -1) (void) ClosePixelCacheOnDisk(cache_info); } } -- 2.40.0