diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-11-15 08:22:54 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-11-15 08:22:54 +0100 |
| commit | 8c630ef059f7e8acd4eef97c85793c80b75f145d (patch) | |
| tree | 7babd2deca04552b223536ea0395296da151097c | |
| parent | f82bbe01c8835b8788c69f05362bb789766473cd (diff) | |
| download | curl-8c630ef059f7e8acd4eef97c85793c80b75f145d.tar.gz | |
glob: fix [a-c] globbing regression
Brought in ee4f76606cf
Added test case 1280 to verify
Reported-by: Dave Reisner
Bug: https://github.com/curl/curl/commit/ee4f76606cfa4ee068bf28edd37c8dae7e8db317#commitcomment-19823146
| -rw-r--r-- | src/tool_urlglob.c | 3 | ||||
| -rw-r--r-- | tests/data/Makefile.inc | 2 | ||||
| -rw-r--r-- | tests/data/test1280 | 58 |
3 files changed, 63 insertions, 0 deletions
diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c index 09d21b61e..08e5d094c 100644 --- a/src/tool_urlglob.c +++ b/src/tool_urlglob.c @@ -213,6 +213,9 @@ static CURLcode glob_range(URLGlob *glob, char **patternp, else if(end_c != ']') /* then this is wrong */ rc = 0; + else + /* end_c == ']' */ + pattern += 4; } *posp += (pattern - *patternp); diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index a2ece3dde..b8b18e5d0 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -129,6 +129,8 @@ test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \ test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \ test1244 test1245 test1246 test1247 \ \ +test1280 \ +\ test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \ test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \ test1316 test1317 test1318 test1319 test1320 test1321 test1322 \ diff --git a/tests/data/test1280 b/tests/data/test1280 new file mode 100644 index 000000000..15c1e2fd1 --- /dev/null +++ b/tests/data/test1280 @@ -0,0 +1,58 @@ +<testcase> +<info> +<keywords> +globbing +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Connection: close + +bytes +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> + <name> +simple [a-d] globbing + </name> + <command> +http://%HOSTIP:%HTTPPORT/[a-d]/1280 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /a/1280 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /b/1280 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /c/1280 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /d/1280 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +</verify> +</testcase> |