From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 27 Aug 2018 19:20:45 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1267
X-Git-Tag: 7.0.8-11~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d109ddce88057c138281785af4d246613e05111;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1267
---

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 78c90b42c..925ffeb86 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -2441,6 +2441,8 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option,
   ssize_t
     option_types;
 
+  if ((options == (const char *) NULL) || (*options == '\0'))
+    return(-1);
   option_info=GetOptionInfo(option);
   if (option_info == (const OptionInfo *) NULL)
     return(UndefinedOptionFlag);
@@ -2469,7 +2471,7 @@ MagickExport ssize_t GetCommandOptionFlags(const CommandOption option,
       if (LocaleCompare(token,option_info[i].mnemonic) == 0)
         break;
     command_info=option_info+i;
-    if ((command_info->mnemonic == (const char *) NULL) &&
+    if ((command_info->mnemonic == (const char *) NULL) && (*token != '\0') &&
         ((strchr(token+1,'-') != (char *) NULL) ||
          (strchr(token+1,'_') != (char *) NULL)))
       {