luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tool_getparam: handle non-existing (out of range) short-options

Browse Source 
... correctly, even when they follow an existing one without a space in
between.

Verify with test 467

Follow-up to 07dd60c05b
Reported-by: Geeknik Labs
Fixes #13101
Closes #13102
This commit is contained in:
Daniel Stenberg 2024-03-11 22:39:22 +01:00
parent 4e4e8af1f6
commit 3ccce37790
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tool_getparam.c
View File

@ -1009,7 +1009,8 @@ static const struct LongShort *single(char letter)
{ {
static const struct LongShort *singles[128 - ' ']; /* ASCII => pointer */ static const struct LongShort *singles[128 - ' ']; /* ASCII => pointer */
static bool singles_done = FALSE; static bool singles_done = FALSE;
DEBUGASSERT((letter < 127) && (letter > ' ')); if((letter >= 127) || (letter <= ' '))
return NULL;
if(!singles_done) { if(!singles_done) {
unsigned int j; unsigned int j;

2
tests/data/Makefile.inc
View File

@ -73,7 +73,7 @@ test426 test427 test428 test429 test430 test431 test432 test433 test434 \
test435 test436 test437 test438 test439 test440 test441 test442 test443 \ test435 test436 test437 test438 test439 test440 test441 test442 test443 \
test444 test445 test446 test447 test448 test449 test450 test451 test452 \ test444 test445 test446 test447 test448 test449 test450 test451 test452 \
test453 test454 test455 test456 test457 test458 test459 test460 test461 \ test453 test454 test455 test456 test457 test458 test459 test460 test461 \
test462 test463 \ test462 test463 test467 \
\ \
test490 test491 test492 test493 test494 test495 test496 test497 test498 \ test490 test491 test492 test493 test494 test495 test496 test497 test498 \
test499 test500 test501 test502 test503 test504 test505 test506 test507 \ test499 test500 test501 test502 test503 test504 test505 test506 test507 \

31
tests/data/test467 Normal file
View File

@ -0,0 +1,31 @@
<testcase>
<info>
<keywords>
cmdline
</keywords>
</info>
#
# Client-side
<client>
<server>
none
</server>
<name>
use a bad short option letter that does not exist (after one does exist)
</name>
# the second option is outside the normal accepted range
<command>
curl -v http://example.com
</command>
</client>
#
# Verify errorcode
<verify>
<errorcode>
2
</errorcode>
</verify>
</testcase>