revert

ImageMagick · Feb 4, 2023 · 1c5c8e9 · 1c5c8e9
1 parent 591e29f
commit 1c5c8e9
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/magick/string.c b/magick/string.c
@@ -1009,7 +1009,20 @@ MagickExport char *FileToString(const char *filename,const size_t extent,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
   p=filename;
   if ((*filename == '@') && (strlen(filename) > 1))
-    p=filename+1;
+    {
+      MagickBooleanType
+        status;
+
+      status=IsRightsAuthorized(PathPolicyDomain,ReadPolicyRights,filename);
+      if (status == MagickFalse)
+        {
+          errno=EPERM;
+          (void) ThrowMagickException(exception,GetMagickModule(),PolicyError,
+            "NotAuthorized","`%s'",filename);
+          return((char *) NULL);
+        }
+      p=filename+1;
+    }
   return((char *) FileToBlob(p,extent,&length,exception));
 }
 
@@ -1043,9 +1056,6 @@ MagickExport char *FileToString(const char *filename,const size_t extent,
 MagickExport StringInfo *FileToStringInfo(const char *filename,
   const size_t extent,ExceptionInfo *exception)
 {
-  const char
-    *p;
-
   StringInfo
     *string_info;
 
@@ -1055,10 +1065,7 @@ MagickExport StringInfo *FileToStringInfo(const char *filename,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
   string_info=AcquireStringInfoContainer();
   (void) CopyMagickString(string_info->path,filename,MaxTextExtent);
-  p=filename;
-  if ((*filename == '@') && (strlen(filename) > 1))
-    p=filename+1;
-  string_info->datum=FileToBlob(p,extent,&string_info->length,exception);
+  string_info->datum=FileToBlob(filename,extent,&string_info->length,exception);
   if (string_info->datum == (unsigned char *) NULL)
     {
       string_info=DestroyStringInfo(string_info);