Skip to content

Commit

Permalink
glob: do not continue parsing after a strtoul() overflow range
Browse files Browse the repository at this point in the history
Added test 1289 to verify.

CVE-2017-1000101

Bug: https://curl.haxx.se/docs/adv_20170809A.html
Reported-by: Brian Carpenter
  • Loading branch information
bagder committed Aug 7, 2017
1 parent 358b2b1 commit 453e7a7
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 2 deletions.
5 changes: 4 additions & 1 deletion src/tool_urlglob.c
Expand Up @@ -273,7 +273,10 @@ static CURLcode glob_range(URLGlob *glob, char **patternp,
}
errno = 0;
max_n = strtoul(pattern, &endp, 10);
if(errno || (*endp == ':')) {
if(errno)
/* overflow */
endp = NULL;
else if(*endp == ':') {
pattern = endp+1;
errno = 0;
step_n = strtoul(pattern, &endp, 10);
Expand Down
2 changes: 1 addition & 1 deletion tests/data/Makefile.inc
Expand Up @@ -132,7 +132,7 @@ test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \
test1260 test1261 test1262 \
\
test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \
test1288 \
test1288 test1289 \
test1298 test1299 \
test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \
test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \
Expand Down
35 changes: 35 additions & 0 deletions tests/data/test1289
@@ -0,0 +1,35 @@
<testcase>
<info>
<keywords>
HTTP
HTTP GET
globbing
</keywords>
</info>

#
# Server-side
<reply>
</reply>

# Client-side
<client>
<server>
http
</server>
<name>
globbing with overflow and bad syntxx
</name>
<command>
http://ur%20[0-60000000000000000000
</command>
</client>

# Verify data after the test has been "shot"
<verify>
# curl: (3) [globbing] bad range in column
<errorcode>
3
</errorcode>
</verify>
</testcase>

0 comments on commit 453e7a7

Please sign in to comment.