mirror of
https://github.com/fluencelabs/musl
synced 2025-06-29 22:51:55 +00:00
fix parent-memory-clobber in posix_spawn (environ)
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user