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

fix segfault on syntax error code path

Browse Source
This commit is contained in:
Denis Vlasenko 2009-04-10 00:45:02 +00:00
parent c96865f445
commit ed7823738c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shell/hush.c
View File

@ -5587,6 +5587,13 @@ int hush_main(int argc, char **argv)
G.PS2 = "> "; G.PS2 = "> ";
#endif #endif
if (setjmp(die_jmp)) {
/* xfunc has failed! die die die */
/* no EXIT traps, this is an escape hatch! */
G.exiting = 1;
hush_exit(xfunc_error_retval);
}
/* Shell is non-interactive at first. We need to call /* Shell is non-interactive at first. We need to call
* block_signals(0) if we are going to execute "sh <script>", * block_signals(0) if we are going to execute "sh <script>",
* "sh -c <cmds>" or login shell's /etc/profile and friends. * "sh -c <cmds>" or login shell's /etc/profile and friends.
@ -5774,12 +5781,6 @@ int hush_main(int argc, char **argv)
/* -1 is special - makes xfuncs longjmp, not exit /* -1 is special - makes xfuncs longjmp, not exit
* (we reset die_sleep = 0 whereever we [v]fork) */ * (we reset die_sleep = 0 whereever we [v]fork) */
enable_restore_tty_pgrp_on_exit(); /* sets die_sleep = -1 */ enable_restore_tty_pgrp_on_exit(); /* sets die_sleep = -1 */
if (setjmp(die_jmp)) {
/* xfunc has failed! die die die */
/* no EXIT traps, this is an escape hatch! */
G.exiting = 1;
hush_exit(xfunc_error_retval);
}
} else if (!signal_mask_is_inited) { } else if (!signal_mask_is_inited) {
block_signals(0); /* 0: called 1st time */ block_signals(0); /* 0: called 1st time */
} /* else: block_signals(0) was done before */ } /* else: block_signals(0) was done before */