From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 26 Aug 2018 12:01:30 +0000 (-0400)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10058
X-Git-Tag: 7.0.8-11~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfd2824f02b6cee4ed6e105d50035c74142d9bf0;p=imagemagick

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10058
---

diff --git a/MagickCore/token.c b/MagickCore/token.c
index 8c37a8544..2231890ec 100644
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -44,6 +44,7 @@
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/memory-private.h"
 #include "MagickCore/string_.h"
@@ -521,7 +522,7 @@ MagickExport MagickBooleanType GlobExpression(const char *expression,
               match=GlobExpression(expression,target,case_insensitive);
               if (match != MagickFalse)
                 {
-                  expression+=strlen(target);
+                  expression+=MagickMin(strlen(expression),strlen(target));
                   break;
                 }
               p=target;