From 8c984758d5f87aba81fe4a7462e1ca7ebda07df5 Mon Sep 17 00:00:00 2001 From: Cristy Date: Fri, 18 Dec 2015 19:38:55 -0500 Subject: [PATCH] Only delete thread-specific data if a destructor is defined --- MagickCore/thread.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MagickCore/thread.c b/MagickCore/thread.c index 34eb5499f..09c23ce4f 100644 --- a/MagickCore/thread.c +++ b/MagickCore/thread.c @@ -118,7 +118,7 @@ MagickExport MagickBooleanType CreateMagickThreadKey(MagickThreadKey *key, % % % % % % -% D e s t r o y M a g i c k T h r e a d K e y % +% D e l e t e M a g i c k T h r e a d K e y % % % % % % % @@ -151,7 +151,8 @@ MagickExport MagickBooleanType DeleteMagickThreadKey(MagickThreadKey key) keys=(MagickThreadValue *) key; for (i=0; i < (ssize_t) keys->number_threads; i++) - if (keys->values[i] != (void *) NULL) + if ((keys->destructor != (void *) NULL) && + (keys->values[i] != (void *) NULL)) { keys->destructor(keys->values[i]); keys->values[i]=(void *) NULL; -- 2.40.0