(no commit message)

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index e5f70cb832914a619fb684b664718b01a774b38e..c288d546bc479ac242eddecbe237596d0f1bbb31 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -1595,10 +1595,10 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand,
   }
 
   /* clean up percent escape interpreted strings */
-  if (arg1 != arg1n )
-    arg1=DestroyString((char *)arg1);
-  if (arg2 != arg2n )
-    arg2=DestroyString((char *)arg2);
+  if ((arg1 && arg1n) && (arg1 != arg1n ))
+    arg1=DestroyString((char *) arg1);
+  if ((arg2 && arg2n) && (arg2 != arg2n ))
+    arg2=DestroyString((char *) arg2);
 
 #undef _image_info
 #undef _exception