aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2010-01-06 05:29:17 -0600
committerRob Landley <rob@landley.net>2010-01-06 05:29:17 -0600
commitdb037ef6e0d7e84e5fd9ba831b55550a9b487257 (patch)
tree712d79a013ddf182852f4d68201c9289c815fcc5
parent7051a963b0f646f0b489dba892d85e4816d95d79 (diff)
downloadtoybox-db037ef6e0d7e84e5fd9ba831b55550a9b487257.tar.gz
Make toy_init() reentrant, or else xexec() has funky errors.
-rw-r--r--main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.c b/main.c
index e0dab1cc..4b4b3765 100644
--- a/main.c
+++ b/main.c
@@ -76,10 +76,12 @@ void toy_init(struct toy_list *which, char *argv[])
if ((which->flags & TOYFLAG_NEEDROOT) && euid)
error_exit("Not root");
-
}
- // Free old toys contents here?
+ // Free old toys contents (to be reentrant)
+
+ if (toys.optargs != toys.argv+1) free(toys.optargs);
+ bzero(&toys, sizeof(struct toy_context));
toys.which = which;
toys.argv = argv;