[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 12/116: curl_fnmatch: return error on illegal wildc
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 12/116: curl_fnmatch: return error on illegal wildcard pattern |
Date: |
Tue, 05 Dec 2017 14:50:42 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit f0364f7e3191c930008de0736ae00ef28d42bd91
Author: Daniel Stenberg <address@hidden>
AuthorDate: Wed Oct 25 23:53:30 2017 +0200
curl_fnmatch: return error on illegal wildcard pattern
... instead of doing an infinite loop!
Added test 1162 to verify.
Reported-by: Max Dymond
Fixes #2015
Closes #2017
---
lib/curl_fnmatch.c | 8 +++++---
tests/data/Makefile.inc | 2 +-
tests/data/test1162 | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
index 631268bc1..5a6f137c8 100644
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -240,10 +240,10 @@ static int setcharset(unsigned char **p, unsigned char
*charset)
if(!ISPRINT(c))
return SETCHARSET_FAIL;
}
- if(c == ']') {
+ else if(c == ']') {
return SETCHARSET_OK;
}
- if(c == '\\') {
+ else if(c == '\\') {
c = *(++(*p));
if(ISPRINT(c)) {
charset[c] = 1;
@@ -253,7 +253,7 @@ static int setcharset(unsigned char **p, unsigned char
*charset)
else
return SETCHARSET_FAIL;
}
- if(c >= rangestart) {
+ else if(c >= rangestart) {
if((ISLOWER(c) && ISLOWER(rangestart)) ||
(ISDIGIT(c) && ISDIGIT(rangestart)) ||
(ISUPPER(c) && ISUPPER(rangestart))) {
@@ -267,6 +267,8 @@ static int setcharset(unsigned char **p, unsigned char
*charset)
else
return SETCHARSET_FAIL;
}
+ else
+ return SETCHARSET_FAIL;
break;
case CURLFNM_SCHS_RIGHTBR:
if(c == '[') {
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index eaa1bbced..b157aeda9 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -125,7 +125,7 @@ test1136 test1137 test1138 test1139 test1140 test1141
test1142 test1143 \
test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \
test1152 test1153 \
\
-test1160 test1161 \
+test1160 test1161 test1162 \
test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \
test1216 test1217 test1218 test1219 \
diff --git a/tests/data/test1162 b/tests/data/test1162
new file mode 100644
index 000000000..73e4646e1
--- /dev/null
+++ b/tests/data/test1162
@@ -0,0 +1,52 @@
+<testcase>
+<info>
+<keywords>
+FTP
+RETR
+LIST
+wildcardmatch
+ftplistparser
+flaky
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+<tool>
+lib576
+</tool>
+<name>
+FTP wildcard with crazy pattern
+</name>
+<command>
+"ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/[*\\s-'tl"
+</command>
+</client>
+<verify>
+<protocol>
+USER anonymous
+PASS address@hidden
+PWD
+CWD fully_simulated
+CWD DOS
+EPSV
+TYPE A
+LIST
+QUIT
+</protocol>
+# 78 == CURLE_REMOTE_FILE_NOT_FOUND
+<errorcode>
+78
+</errorcode>
+</verify>
+</testcase>
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] branch master updated (131de33cb -> 054e207ac), gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 05/116: libtest: Add required test libraries for lib1552 and lib1553, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 03/116: curl_mime_filedata.3: fix typos, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 04/116: libcurl-tutorial.3: fix typo, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 02/116: RELEASE-NOTES: clean slate towards 7.57.0, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 01/116: travis: exit if any steps fail, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 12/116: curl_fnmatch: return error on illegal wildcard pattern,
gnunet <=
- [GNUnet-SVN] [gnurl] 10/116: multi: allow table handle sizes to be overridden, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 22/116: ROADMAP.md: spelling fixes, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 13/116: timeval: make timediff_t also work on 32bit windows, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 08/116: ftplistparser: follow-up cleanup to remove PL_ERROR(), gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 21/116: Curl_timeleft: change return type to timediff_t, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 06/116: timediff: return timediff_t from the time diff functions, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 16/116: curl_setup.h: oops, shorten the too long line, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 18/116: resolvers: only include anything if needed, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 35/116: curlx: the timeval functions are no longer provided as curlx_*, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 17/116: HELP-US: rename the subtitle too since the label is changed, gnunet, 2017/12/05