nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix shell buffer overflow on long argument lists.

This commit is contained in:
Jonas 'Sortie' Termansen 2013-03-18 19:04:34 +01:00
parent c8b795aab3
commit 53005fc01f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/mxsh.cpp
View File

@ -316,7 +316,8 @@ void get_and_run_command()
}
int argc = 0;
const char* argv[256];
const size_t ARGV_MAX_LENGTH = 2048;
const char* argv[ARGV_MAX_LENGTH];
argv[0] = NULL;
bool lastwasspace = true;
@ -346,7 +347,16 @@ void get_and_run_command()
}
default:
escaped = false;
if ( lastwasspace ) { argv[argc++] = command + i; }
if ( lastwasspace )
{
if ( argc == ARGV_MAX_LENGTH )
{
fprintf(stderr, "argv max length of %zu entries hit!\n",
ARGV_MAX_LENGTH);
abort();
}
argv[argc++] = command + i;
}
lastwasspace = false;
}
}