(no commit message)

diff --git a/magick/string.c b/magick/string.c
index 99e77be652b052ed95886c41c29b73c8ed669f13..e171e2e29a590ad11d94fcd8d99d071f1ac79e85 100644 (file)
--- 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 131ec768fc68378f8f0a10a068828c939724c3f4..1993ae1f1fb384e5412fd8aaf02828baf1330c34 100644 (file)
--- 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;