From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 9 Nov 2011 23:07:28 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6660
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ebdd939f038e1240df51782bba84704c807ea48;p=imagemagick

---

diff --git a/coders/tiff.c b/coders/tiff.c
index 87b5d076f..c79c83976 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1912,9 +1912,15 @@ ModuleExport void UnregisterTIFFImage(void)
     tiff_semaphore=AllocateSemaphoreInfo();
   LockSemaphoreInfo(tiff_semaphore);
   if (instantiate_key != MagickFalse)
-    if (MagickDeleteThreadKey(tiff_exception) == MagickFalse)
-      ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-  instantiate_key=MagickFalse;
+    {
+#if defined(MAGICKCORE_HAVE_TIFFMERGEFIELDINFO) && defined(MAGICKCORE_HAVE_TIFFSETTAGEXTENDER)
+      if (tag_extender == (TIFFExtendProc) NULL)
+        (void) TIFFSetTagExtender(tag_extender);
+#endif
+      if (MagickDeleteThreadKey(tiff_exception) == MagickFalse)
+        ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+      instantiate_key=MagickFalse;
+    }
   UnlockSemaphoreInfo(tiff_semaphore);
   DestroySemaphoreInfo(&tiff_semaphore);
 }