diff options
author | Rob Landley <rob@landley.net> | 2012-11-16 00:35:46 -0600 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2012-11-16 00:35:46 -0600 |
commit | caf39c26827f355c4e107f55c5c51f67c484bfd7 (patch) | |
tree | 718852f37b7143cb63e6e8838093993b19391a39 /main.c | |
parent | 02261e8082b9b098b20a4291fc2583f3c41db8d2 (diff) | |
download | toybox-caf39c26827f355c4e107f55c5c51f67c484bfd7.tar.gz |
Add rebound support to intercept error_exit() and longjmp instead.
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -76,10 +76,10 @@ void toy_init(struct toy_list *which, char *argv[]) if ((which->flags & TOYFLAG_NEEDROOT) && euid) error_exit("Not root"); } - // Free old toys contents (to be reentrant) + // Free old toys contents (to be reentrant), but leave rebound if any if (toys.optargs != toys.argv+1) free(toys.optargs); - memset(&toys, 0, sizeof(struct toy_context)); + memset(&toys, 0, offsetof(struct toy_context, rebound)); toys.which = which; toys.argv = argv; |