From a93af43974c02c675443e285fa9d9710b2f0a7c9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 22 Apr 2007 09:31:27 +0000 Subject: - Song Ma's warning if -r/--range is given with a "bad" range, also noted in the man page now. --- src/main.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main.c b/src/main.c index 55d1d0adf..229eb8dc8 100644 --- a/src/main.c +++ b/src/main.c @@ -2350,7 +2350,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ (and won't actually be range by definition). The man page previously claimed that to be a good way, why this code is added to work-around it. */ - if(!strchr(nextarg, '-')) { + if(ISDIGIT(*nextarg) && !strchr(nextarg, '-')) { char buffer[32]; curl_off_t off; warnf(config, @@ -2360,10 +2360,23 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ snprintf(buffer, sizeof(buffer), "%Od-", off); GetStr(&config->range, buffer); } - else + { + /* byte range requested */ + char* tmp_range; + tmp_range=nextarg; + while(*tmp_range != '\0') { + if(!ISDIGIT(*tmp_range)&&*tmp_range!='-'&&*tmp_range!=',') { + warnf(config,"Invalid character is found in given range. " + "A specified range MUST have only digits in " + "\'start\'-\'stop\'. The server's response to this " + "request is uncertain.\n"); + break; + } + tmp_range++; + } /* byte range requested */ GetStr(&config->range, nextarg); - + } break; case 'R': /* use remote file's time */ -- cgit v1.2.3