mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-21 12:05:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibCore: Fix segfault in CArgsParser (#1072)

Browse source 
CArgsParser::parse_next_param did not properly ensure that, when
a param required a following argument, there were enough parameters left to
complete the parse. This meant that params_left could become negative,
avoiding parse_next_param's termination condition, and cause a segfault
when reading from argv with an out of bounds index.

This fixes the check to ensure that we do in fact have the right amount
of parameters and also adds an assertion to ensure that params_left does
not become negative.
This commit is contained in:
DrewStratford 2020-01-14 02:52:25 +13:00 • committed by Andreas Kling
parent ad5ee27ea9
commit 2a8de4cdec
Notes: sideshowbarker 2024-07-19 10:04:26 +09:00
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Libraries/LibCore/CArgsParser.cpp
View file

@ -59,6 +59,7 @@ CArgsParserResult CArgsParser::parse(int argc, char** argv)
int CArgsParser::parse_next_param(int index, char** argv, const int params_left, CArgsParserResult& res)
{
ASSERT(params_left >= 0);
if (params_left == 0)
return 0;
@ -80,7 +81,7 @@ int CArgsParser::parse_next_param(int index, char** argv, const int params_left,
// If this parameter must be followed by a value, we look for it
if (!arg->value.value_name.is_null()) {
if (params_left < 1) {
if (params_left < 2) {
printf("Missing value for argument %s\n", arg->value.name.characters());
return -1;
}