system:shred value has precedence over MAGICK_SHRED_PASSES

ImageMagick · Jun 6, 2022 · a29777d · a29777d
1 parent 1671346
commit a29777d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/magick/utility.c b/magick/utility.c
@@ -1874,13 +1874,20 @@ MagickPrivate MagickBooleanType ShredFile(const char *path)
         *property;
 
       property=GetPolicyValue("system:shred");
-      if (property == (char *) NULL)
-        property=GetEnvironmentValue("MAGICK_SHRED_PASSES");
       if (property != (char *) NULL)
         {
           passes=(ssize_t) StringToInteger(property);
           property=DestroyString(property);
         }
+      if (passes == -1)
+        {
+          property=GetEnvironmentValue("MAGICK_SHRED_PASSES");
+          if (property != (char *) NULL)
+            {
+              passes=(ssize_t) StringToInteger(property);
+              property=DestroyString(property);
+            }
+        }
     }
   if (passes <= 0)
     {