From b055001b6a69cf8fd513d36622cf693ee20c0e92 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 24 May 2007 12:18:16 +0000 Subject: hush: fix handling of unmatched ${name (without closing '}') - was eating all remaining input, potentially megabytes. nofork: save/restore die_jmp too nofork: use -2222 instead of -111 as "special" return valur for zero (-111 is used by some applets. -2222 won't fit in exitcode and thus safer) --- libbb/error_msg_and_die.c | 6 +++--- libbb/vfork_daemon_rexec.c | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'libbb') diff --git a/libbb/error_msg_and_die.c b/libbb/error_msg_and_die.c index 20d971591..0e99a03cf 100644 --- a/libbb/error_msg_and_die.c +++ b/libbb/error_msg_and_die.c @@ -27,9 +27,9 @@ void xfunc_die(void) * p = xmalloc(10); * q = xmalloc(10); // BUG! if this dies, we leak p! */ - /* -111 means "zero" (longjmp can't pass 0) - * spawn_and_wait() catches -111. */ - longjmp(die_jmp, xfunc_error_retval ? xfunc_error_retval : -111); + /* -2222 means "zero" (longjmp can't pass 0) + * run_nofork_applet() catches -2222. */ + longjmp(die_jmp, xfunc_error_retval ? xfunc_error_retval : -2222); } sleep(die_sleep); } diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c index a2572b0a9..349628796 100644 --- a/libbb/vfork_daemon_rexec.c +++ b/libbb/vfork_daemon_rexec.c @@ -103,6 +103,7 @@ int wait_pid(int *wstat, int pid) #if ENABLE_FEATURE_PREFER_APPLETS void save_nofork_data(struct nofork_save_area *save) { + memcpy(&save->die_jmp, &die_jmp, sizeof(die_jmp)); save->current_applet = current_applet; save->xfunc_error_retval = xfunc_error_retval; save->option_mask32 = option_mask32; @@ -112,6 +113,7 @@ void save_nofork_data(struct nofork_save_area *save) void restore_nofork_data(struct nofork_save_area *save) { + memcpy(&die_jmp, &save->die_jmp, sizeof(die_jmp)); current_applet = save->current_applet; xfunc_error_retval = save->xfunc_error_retval; option_mask32 = save->option_mask32; @@ -147,7 +149,7 @@ int run_nofork_applet_prime(struct nofork_save_area *old, const struct bb_applet rc = a->main(argc, tmp_argv); } else { /* xfunc died in NOFORK applet */ /* in case they meant to return 0... */ - if (rc == -111) + if (rc == -2222) rc = 0; } @@ -159,6 +161,7 @@ int run_nofork_applet_prime(struct nofork_save_area *old, const struct bb_applet int run_nofork_applet(const struct bb_applet *a, char **argv) { struct nofork_save_area old; + /* Saving globals */ save_nofork_data(&old); return run_nofork_applet_prime(&old, a, argv); -- cgit v1.2.3-55-g6feb