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

lash: make -c work; crush buffer overrun and free of non-malloced ptr

Browse Source 
(from Mats Erik Andersson <mats.andersson64@comhem.se>)
This commit is contained in:
Denis Vlasenko 2007-03-31 11:08:50 +00:00
parent 6fa8b8e17f
commit f443bffd3c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
shell/lash.c
View File

@ -114,7 +114,7 @@ static int builtin_read(struct child_prog *cmd);
/* function prototypes for shell stuff */ /* function prototypes for shell stuff */
static void checkjobs(struct jobset *job_list); static void checkjobs(struct jobset *job_list);
static void remove_job(struct jobset *j_list, struct job *job); static void remove_job(struct jobset *j_list, struct job *job);
static int get_command(FILE * source, char *command); static int get_command_bufsiz(FILE * source, char *command);
static int parse_command(char **command_ptr, struct job *job, int *inbg); static int parse_command(char **command_ptr, struct job *job, int *inbg);
static int run_command(struct job *newjob, int inbg, int outpipe[2]); static int run_command(struct job *newjob, int inbg, int outpipe[2]);
static int pseudo_exec(struct child_prog *cmd) ATTRIBUTE_NORETURN; static int pseudo_exec(struct child_prog *cmd) ATTRIBUTE_NORETURN;
@ -649,15 +649,14 @@ static inline const char* setup_prompt_string(void)
static line_input_t *line_input_state; static line_input_t *line_input_state;
#endif #endif
static int get_command(FILE * source, char *command) static int get_command_bufsiz(FILE * source, char *command)
{ {
const char *prompt_str; const char *prompt_str;
if (source == NULL) { if (source == NULL) {
if (local_pending_command) { if (local_pending_command) {
/* a command specified (-c option): return it & mark it done */ /* a command specified (-c option): return it & mark it done */
strcpy(command, local_pending_command); strncpy(command, local_pending_command, BUFSIZ);
free(local_pending_command);
local_pending_command = NULL; local_pending_command = NULL;
return 0; return 0;
} }
@ -1363,12 +1362,12 @@ static int busy_loop(FILE * input)
checkjobs(&job_list); checkjobs(&job_list);
if (!next_command) { if (!next_command) {
if (get_command(input, command)) if (get_command_bufsiz(input, command))
break; break;
next_command = command; next_command = command;
} }
if (! expand_arguments(next_command)) { if (!expand_arguments(next_command)) {
free(command); free(command);
command = xzalloc(BUFSIZ); command = xzalloc(BUFSIZ);
next_command = NULL; next_command = NULL;
@ -1455,8 +1454,6 @@ static void free_memory(void)
if (cwd && cwd != bb_msg_unknown) { if (cwd && cwd != bb_msg_unknown) {
free((char*)cwd); free((char*)cwd);
} }
if (local_pending_command)
free(local_pending_command);
if (job_list.fg && !job_list.fg->running_progs) { if (job_list.fg && !job_list.fg->running_progs) {
remove_job(&job_list, job_list.fg); remove_job(&job_list, job_list.fg);
@ -1538,7 +1535,7 @@ int lash_main(int argc_l, char **argv_l)
opt = getopt32(argc_l, argv_l, "+ic:", &local_pending_command); opt = getopt32(argc_l, argv_l, "+ic:", &local_pending_command);
#define LASH_OPT_i (1<<0) #define LASH_OPT_i (1<<0)
#define LASH_OPT_c (1<<2) #define LASH_OPT_c (1<<1)
if (opt & LASH_OPT_c) { if (opt & LASH_OPT_c) {
input = NULL; input = NULL;
optind++; optind++;