From 97c8bdd88ae2ee03eb9d333a79fa669b3878fc76 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 18 Oct 2012 16:41:27 -0400 Subject: fix parent-memory-clobber in posix_spawn (environ) --- src/process/posix_spawn.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/process/posix_spawn.c') diff --git a/src/process/posix_spawn.c b/src/process/posix_spawn.c index e8557487..c3e800b8 100644 --- a/src/process/posix_spawn.c +++ b/src/process/posix_spawn.c @@ -19,7 +19,7 @@ weak_alias(dummy_0, __release_ptc); pid_t __vfork(void); int __posix_spawnx(pid_t *restrict res, const char *restrict path, - int (*exec)(const char *, char *const *), + int (*exec)(const char *, char *const *, char *const *), const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *restrict attr, char *const argv[restrict], char *const envp[restrict]) @@ -95,8 +95,7 @@ int __posix_spawnx(pid_t *restrict res, const char *restrict path, sigprocmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK) ? &attr->__mask : &oldmask, 0); - if (envp) environ = (char **)envp; - exec(path, argv); + exec(path, argv, envp ? envp : environ); _exit(127); return 0; @@ -107,5 +106,5 @@ int posix_spawn(pid_t *restrict res, const char *restrict path, const posix_spawnattr_t *restrict attr, char *const argv[restrict], char *const envp[restrict]) { - return __posix_spawnx(res, path, execv, fa, attr, argv, envp); + return __posix_spawnx(res, path, execve, fa, attr, argv, envp); } -- cgit v1.2.1