aboutsummaryrefslogtreecommitdiff
path: root/toys/other/chroot.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2013-07-18 18:20:03 -0500
committerRob Landley <rob@landley.net>2013-07-18 18:20:03 -0500
commita817a02c00a06fbf2090259320968addb5f46e58 (patch)
tree626d9761e1346afc168f64cbfe4dfba9538c20ef /toys/other/chroot.c
parent39af4ae3e61d352c3faa7d1b87e6ac6fdb69add1 (diff)
downloadtoybox-a817a02c00a06fbf2090259320968addb5f46e58.tar.gz
Replace users of xexec(toys.optargs) with xexec_optargs(0) to avoid free/reuse bug during argument parsing.
Diffstat (limited to 'toys/other/chroot.c')
-rw-r--r--toys/other/chroot.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/toys/other/chroot.c b/toys/other/chroot.c
index c9ff10c7..00fb4e7f 100644
--- a/toys/other/chroot.c
+++ b/toys/other/chroot.c
@@ -18,6 +18,8 @@ config CHROOT
void chroot_main(void)
{
char *binsh[] = {"/bin/sh", "-i", 0};
+
if (chdir(*toys.optargs) || chroot(".")) perror_exit("%s", *toys.optargs);
- xexec(toys.optargs[1] ? toys.optargs+1 : binsh);
+ if (toys.optargs[1]) xexec_optargs(1);
+ else xexec(binsh);
}