From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 16 Feb 2015 20:49:10 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=862fc616586b318a46843a1e3bf514a2f40c48ae;p=imagemagick

---

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index e5f70cb83..c288d546b 100644
--- 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