github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-03-01 09:31:16 +00:00
Code Releases Activity

SCP: Fix internal argv style parsing routine to avoid reaching beyond array

Browse Source
This commit is contained in:
Mark Pizzolato
2022-11-30 15:46:02 -10:00
parent 0155f60232
commit 16d0977a39
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scp.c
View File

@@ -4493,7 +4493,7 @@ strlcpy (argline, cptr, arg_size);
cp = argline + (arg_size / 2);
strlcpy (cp, cptr, arg_size / 2);
argv[0] = argline; /* argv[0] points to unparsed arguments */
argv[argc + 1] = NULL; /* make sure the argument list always ends with a NULL */
argv[argc] = NULL; /* make sure the argument list always ends with a NULL */
while (*cp) {
while (sim_isspace (*cp)) /* skip blanks */
cp++;
@@ -16870,6 +16870,10 @@ static struct parse_arg_function_test {
const char *input;
struct arg_test_result result;
} parse_arg_function_tests[] = {
{"",
{1, {"", NULL}}},
{"1",
{2, {"", "1", NULL}}},
{"1 2 3 4",
{5, {"", "1", "2", "3", "4", NULL}}},
{"'1 2 3 4'",