aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-03-12 21:36:49 +0000
committerEric Andersen <andersen@codepoet.org>2001-03-12 21:36:49 +0000
commit4987bbf97924044c88007c45ee2674d97b93ad92 (patch)
treee6e1eb55e0a787df1c768713bfca467439ec0217
parent5ec5415402ee6e4ae21e4a50c04360908325ba81 (diff)
downloadbusybox-4987bbf97924044c88007c45ee2674d97b93ad92.tar.gz
A fix from Larry Doolittle for some nasty segfaults when sh.c tried to free a
corrupted cmd pointer, and where it would truncate a command line at the first double space. -Erik
-rw-r--r--lash.c6
-rw-r--r--sh.c6
-rw-r--r--shell/lash.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/lash.c b/lash.c
index d321c929b..67d6e4f51 100644
--- a/lash.c
+++ b/lash.c
@@ -970,10 +970,10 @@ static int expand_arguments(char *command)
{
int flags = GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE;
- char * tmpcmd;
+ char * tmpcmd, *cmd, *cmd_copy;
/* We need a clean copy, so strsep can mess up the copy while
* we write stuff into the original (in a minute) */
- char * cmd = strdup(command);
+ cmd = cmd_copy = strdup(command);
*command = '\0';
for (tmpcmd = cmd; (tmpcmd = strsep(&cmd, " \t")) != NULL;) {
if (*tmpcmd == '\0')
@@ -1006,7 +1006,7 @@ static int expand_arguments(char *command)
globfree (&expand_result);
}
}
- free(cmd);
+ free(cmd_copy);
trim(command);
}
diff --git a/sh.c b/sh.c
index d321c929b..67d6e4f51 100644
--- a/sh.c
+++ b/sh.c
@@ -970,10 +970,10 @@ static int expand_arguments(char *command)
{
int flags = GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE;
- char * tmpcmd;
+ char * tmpcmd, *cmd, *cmd_copy;
/* We need a clean copy, so strsep can mess up the copy while
* we write stuff into the original (in a minute) */
- char * cmd = strdup(command);
+ cmd = cmd_copy = strdup(command);
*command = '\0';
for (tmpcmd = cmd; (tmpcmd = strsep(&cmd, " \t")) != NULL;) {
if (*tmpcmd == '\0')
@@ -1006,7 +1006,7 @@ static int expand_arguments(char *command)
globfree (&expand_result);
}
}
- free(cmd);
+ free(cmd_copy);
trim(command);
}
diff --git a/shell/lash.c b/shell/lash.c
index d321c929b..67d6e4f51 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -970,10 +970,10 @@ static int expand_arguments(char *command)
{
int flags = GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE;
- char * tmpcmd;
+ char * tmpcmd, *cmd, *cmd_copy;
/* We need a clean copy, so strsep can mess up the copy while
* we write stuff into the original (in a minute) */
- char * cmd = strdup(command);
+ cmd = cmd_copy = strdup(command);
*command = '\0';
for (tmpcmd = cmd; (tmpcmd = strsep(&cmd, " \t")) != NULL;) {
if (*tmpcmd == '\0')
@@ -1006,7 +1006,7 @@ static int expand_arguments(char *command)
globfree (&expand_result);
}
}
- free(cmd);
+ free(cmd_copy);
trim(command);
}