From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 25 Aug 2018 18:17:07 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.8-11~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=547bbee0887b69e7760b15d993afd678d8008156;p=imagemagick

...
---

diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index 620b33bca..637cb1afb 100644
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -399,15 +399,14 @@ MagickExport Image *PingImages(ImageInfo *image_info,const char *filename,
 %
 */
 
-static MagickBooleanType IsCoderAuthorized(const char *module,const char *coder,
+static MagickBooleanType IsCoderAuthorized(const char *coder,
   const PolicyRights rights,ExceptionInfo *exception)
 {
-  if ((IsRightsAuthorized(ModulePolicyDomain,rights,module) == MagickFalse) ||
-      (IsRightsAuthorized(CoderPolicyDomain,rights,coder) == MagickFalse))
+  if (IsRightsAuthorized(CoderPolicyDomain,rights,coder) == MagickFalse)
     {
       errno=EPERM;
       (void) ThrowMagickException(exception,GetMagickModule(),PolicyError,
-        "NotAuthorized","`%s:%s'",module,coder);
+        "NotAuthorized","`%s'",coder);
       return(MagickFalse);
     }
   return(MagickTrue);
@@ -545,8 +544,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
       */
       if (GetMagickDecoderThreadSupport(magick_info) == MagickFalse)
         LockSemaphoreInfo(magick_info->semaphore);
-      status=IsCoderAuthorized(magick_info->module,read_info->magick,
-        ReadPolicyRights,exception);
+      status=IsCoderAuthorized(read_info->magick,ReadPolicyRights,exception);
       image=(Image *) NULL;
       if (status != MagickFalse)
         image=decoder(read_info,exception);
@@ -610,8 +608,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
       */
       if (GetMagickDecoderThreadSupport(magick_info) == MagickFalse)
         LockSemaphoreInfo(magick_info->semaphore);
-      status=IsCoderAuthorized(magick_info->module,read_info->magick,
-        ReadPolicyRights,exception);
+      status=IsCoderAuthorized(read_info->magick,ReadPolicyRights,exception);
       image=(Image *) NULL;
       if (status != MagickFalse)
         image=(decoder)(read_info,exception);
@@ -1168,8 +1165,7 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
       */
       if (GetMagickEncoderThreadSupport(magick_info) == MagickFalse)
         LockSemaphoreInfo(magick_info->semaphore);
-      status=IsCoderAuthorized(magick_info->module,write_info->magick,
-        WritePolicyRights,exception);
+      status=IsCoderAuthorized(write_info->magick,WritePolicyRights,exception);
       if (status != MagickFalse)
         status=encoder(write_info,image,exception);
       if (GetMagickEncoderThreadSupport(magick_info) == MagickFalse)
@@ -1235,8 +1231,8 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
               */
               if (GetMagickEncoderThreadSupport(magick_info) == MagickFalse)
                 LockSemaphoreInfo(magick_info->semaphore);
-              status=IsCoderAuthorized(magick_info->module,write_info->magick,
-                WritePolicyRights,exception);
+              status=IsCoderAuthorized(write_info->magick,WritePolicyRights,
+                exception);
               if (status != MagickFalse)
                 status=encoder(write_info,image,exception);
               if (GetMagickEncoderThreadSupport(magick_info) == MagickFalse)
diff --git a/MagickCore/token.c b/MagickCore/token.c
index abddc26b0..4471a7d87 100644
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -557,9 +557,9 @@ MagickExport MagickBooleanType GlobExpression(const char *expression,
                   }
               }
             }
-            if (GetUTFCode(pattern) != 0)
-              pattern+=GetUTFOctets(pattern);
-          }
+          if (GetUTFCode(pattern) != 0)
+            pattern+=GetUTFOctets(pattern);
+        }
         break;
       }
       case '\\':