diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-05-11 16:58:46 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-05-11 16:58:46 +0000 |
commit | 8ff167e7105b330d069ffff351be3eae1df337e8 (patch) | |
tree | e6644e9f97dab0198ad771e1d330e02a7cce8553 /hush.c | |
parent | cbdc734b320c0cde4ca3b25d15add9c6153eb7df (diff) | |
download | busybox-w32-8ff167e7105b330d069ffff351be3eae1df337e8.tar.gz busybox-w32-8ff167e7105b330d069ffff351be3eae1df337e8.tar.bz2 busybox-w32-8ff167e7105b330d069ffff351be3eae1df337e8.zip |
Fix a segfault in lash, hush, and cmdedit. Each of these used
xgetcwd, but did not check the return for a NULL, and then continued
to call strlen on the NULL when the cwd had been removed from under it.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@2613 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'hush.c')
-rw-r--r-- | hush.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -429,6 +429,8 @@ static int builtin_cd(struct child_prog *child) | |||
429 | return EXIT_FAILURE; | 429 | return EXIT_FAILURE; |
430 | } | 430 | } |
431 | cwd = xgetcwd(cwd); | 431 | cwd = xgetcwd(cwd); |
432 | if (!cwd) | ||
433 | cwd = unknown; | ||
432 | return EXIT_SUCCESS; | 434 | return EXIT_SUCCESS; |
433 | } | 435 | } |
434 | 436 | ||
@@ -568,6 +570,8 @@ static int builtin_jobs(struct child_prog *child) | |||
568 | static int builtin_pwd(struct child_prog *dummy) | 570 | static int builtin_pwd(struct child_prog *dummy) |
569 | { | 571 | { |
570 | cwd = xgetcwd(cwd); | 572 | cwd = xgetcwd(cwd); |
573 | if (!cwd) | ||
574 | cwd = unknown; | ||
571 | puts(cwd); | 575 | puts(cwd); |
572 | return EXIT_SUCCESS; | 576 | return EXIT_SUCCESS; |
573 | } | 577 | } |
@@ -2307,6 +2311,8 @@ int shell_main(int argc, char **argv) | |||
2307 | 2311 | ||
2308 | /* initialize the cwd -- this is never freed...*/ | 2312 | /* initialize the cwd -- this is never freed...*/ |
2309 | cwd = xgetcwd(0); | 2313 | cwd = xgetcwd(0); |
2314 | if (!cwd) | ||
2315 | cwd = unknown; | ||
2310 | #ifdef BB_FEATURE_COMMAND_EDITING | 2316 | #ifdef BB_FEATURE_COMMAND_EDITING |
2311 | cmdedit_set_initial_prompt(); | 2317 | cmdedit_set_initial_prompt(); |
2312 | #else | 2318 | #else |