From: Jay Satiro <raysatiro@yahoo.com>
Date: Fri, 25 Nov 2016 03:25:14 +0000 (-0500)
Subject: tool_urlglob: Improve sanity check in glob_range
X-Git-Tag: curl-7_52_0~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6618b52508049771c1eb988bebe2f2bcfd9ea33;p=curl

tool_urlglob: Improve sanity check in glob_range

Prior to this change we depended on errno if strtol could not perform a
conversion. POSIX says EINVAL *may* be set. Some implementations like
Microsoft's will not set it if there's no conversion.

Ref: https://github.com/curl/curl/commit/ee4f7660#commitcomment-19658189
---

diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c
index 23fc7f39e..e68e30e84 100644
--- a/src/tool_urlglob.c
+++ b/src/tool_urlglob.c
@@ -201,7 +201,7 @@ static CURLcode glob_range(URLGlob *glob, char **patternp,
         unsigned long lstep;
         errno = 0;
         lstep = strtoul(&pattern[4], &endp, 10);
-        if(errno || (*endp != ']'))
+        if(errno || &pattern[4] == endp || *endp != ']')
           step = -1;
         else {
           pattern = endp+1;