emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dc: fix a case where we can run off malloced space

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-07-15 08:37:36 +02:00
parent 43a668b2ee
commit f2f9bc5932
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
miscutils/dc.c
View File

@ -15,7 +15,7 @@
//usage: "p - print top of the stack (without popping),\n" //usage: "p - print top of the stack (without popping),\n"
//usage: "f - print entire stack,\n" //usage: "f - print entire stack,\n"
//usage: "o - pop the value and set output radix (must be 10, 16, 8 or 2).\n" //usage: "o - pop the value and set output radix (must be 10, 16, 8 or 2).\n"
//usage: "Examples: 'dc 2 2 add' -> 4, 'dc 8 8 * 2 2 + /' -> 16" //usage: "Examples: 'dc 2 2 add p' -> 4, 'dc 8 8 * 2 2 + / p' -> 16"
//usage: //usage:
//usage:#define dc_example_usage //usage:#define dc_example_usage
//usage: "$ dc 2 2 + p\n" //usage: "$ dc 2 2 + p\n"
@ -245,19 +245,6 @@ static void stack_machine(const char *argument)
bb_error_msg_and_die("syntax error at '%s'", argument); bb_error_msg_and_die("syntax error at '%s'", argument);
} }
/* return pointer to next token in buffer and set *buffer to one char
* past the end of the above mentioned token
*/
static char *get_token(char **buffer)
{
char *current = skip_whitespace(*buffer);
if (*current != '\0') {
*buffer = skip_non_whitespace(current);
return current;
}
return NULL;
}
int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int dc_main(int argc UNUSED_PARAM, char **argv) int dc_main(int argc UNUSED_PARAM, char **argv)
{ {
@ -272,16 +259,18 @@ int dc_main(int argc UNUSED_PARAM, char **argv)
while ((line = xmalloc_fgetline(stdin)) != NULL) { while ((line = xmalloc_fgetline(stdin)) != NULL) {
cursor = line; cursor = line;
while (1) { while (1) {
token = get_token(&cursor); token = skip_whitespace(cursor);
if (!token) if (*token == '\0')
break; break;
*cursor++ = '\0'; cursor = skip_non_whitespace(token);
if (*cursor != '\0')
*cursor++ = '\0';
stack_machine(token); stack_machine(token);
} }
free(line); free(line);
} }
} else { } else {
// why? it breaks "dc -2 2 * p" // why? it breaks "dc -2 2 + p"
//if (argv[0][0] == '-') //if (argv[0][0] == '-')
// bb_show_usage(); // bb_show_usage();
do { do {