From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 22 Jan 2011 21:30:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74895d33fcb55c51dd9205984fadb102e20bae16;p=imagemagick

---

diff --git a/magick/string.c b/magick/string.c
index 99e77be65..e171e2e29 100644
--- a/magick/string.c
+++ b/magick/string.c
@@ -1914,6 +1914,8 @@ MagickExport char **StringToArgv(const char *text,int *argc)
   {
     while (isspace((int) ((unsigned char) *p)) != 0)
       p++;
+    if (*p == '\0') 
+      break;
     (*argc)++;
     if (*p == '"')
       for (p++; (*p != '"') && (*p != '\0'); p++) ;
diff --git a/magick/utility.c b/magick/utility.c
index 131ec768f..1993ae1f1 100644
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -799,7 +799,6 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
         exception=DestroyExceptionInfo(exception);
         if (files == (char *) NULL)
           continue;
-        StripString(files);
         filelist=StringToArgv(files,&length);
         if (filelist == (char **) NULL)
           continue;