From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 24 Jun 2017 11:50:40 +0000 (-0400)
Subject: Add check to ensure security policy is instantiated
X-Git-Tag: 7.0.6-1~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=147fc6de50182217b9976df5f80b1d09c2df9405;p=imagemagick

Add check to ensure security policy is instantiated
---

diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 8c8aa5379..39d1a11d3 100644
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -1074,6 +1074,8 @@ MagickExport MagickBooleanType SetMagickSecurityPolicy(const char *policy,
   MagickBooleanType
     status;
   
+  if (IsPolicyCacheInstantiated(exception) == MagickFalse)
+    return((PolicyInfo *) NULL);
   LockSemaphoreInfo(policy_semaphore);
   ResetLinkedListIterator(policy_cache);
   p=(PolicyInfo *) GetNextValueInLinkedList(policy_cache);