Make toy_init() reentrant, or else xexec() has funky errors.

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;