diff options
| -rw-r--r-- | src/tool_urlglob.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c index 0f889eb34..133725242 100644 --- a/src/tool_urlglob.c +++ b/src/tool_urlglob.c @@ -212,7 +212,7 @@ static CURLcode glob_range(URLGlob *glob, char **patternp, *posp += (pattern - *patternp); if((rc != 2) || (min_c >= max_c) || ((max_c - min_c) > ('z' - 'a')) || - (step < 0) ) + (step <= 0) ) /* the pattern is not well-formed */ return GLOBERROR("bad range", *posp, CURLE_URL_MALFORMAT); @@ -222,7 +222,8 @@ static CURLcode glob_range(URLGlob *glob, char **patternp, pat->content.CharRange.max_c = max_c; if(multiply(amount, (pat->content.CharRange.max_c - - pat->content.CharRange.min_c + 1))) + pat->content.CharRange.min_c) / + pat->content.CharRange.step + 1) ) return GLOBERROR("range overflow", *posp, CURLE_URL_MALFORMAT); } else if(ISDIGIT(*pattern)) { @@ -276,7 +277,8 @@ static CURLcode glob_range(URLGlob *glob, char **patternp, *posp += (pattern - *patternp); - if(!endp || (min_n > max_n) || (step_n > (max_n - min_n))) + if(!endp || (min_n > max_n) || (step_n > (max_n - min_n)) || + (step_n <= 0) ) /* the pattern is not well-formed */ return GLOBERROR("bad range", *posp, CURLE_URL_MALFORMAT); @@ -287,7 +289,8 @@ static CURLcode glob_range(URLGlob *glob, char **patternp, pat->content.NumRange.step = step_n; if(multiply(amount, (pat->content.NumRange.max_n - - pat->content.NumRange.min_n + 1))) + pat->content.NumRange.min_n) / + pat->content.NumRange.step + 1) ) return GLOBERROR("range overflow", *posp, CURLE_URL_MALFORMAT); } else @@ -666,4 +669,3 @@ CURLcode glob_match_url(char **result, char *filename, URLGlob *glob) *result = target; return CURLE_OK; } - |