aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/execve.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux/execve.c')
-rw-r--r--sysdeps/unix/sysv/linux/execve.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/execve.c b/sysdeps/unix/sysv/linux/execve.c
index 31277d040e..bec268f492 100644
--- a/sysdeps/unix/sysv/linux/execve.c
+++ b/sysdeps/unix/sysv/linux/execve.c
@@ -20,6 +20,7 @@
#include <unistd.h>
#include <sysdep.h>
+#include <alloca.h>
#include <sys/syscall.h>
#include <bp-checks.h>
@@ -41,7 +42,7 @@ __execve (file, argv, envp)
__pthread_kill_other_threads_np ();
#if __BOUNDED_POINTERS__
{
- char **v;
+ char *const *v;
int i;
char *__unbounded *__unbounded ubp_argv;
char *__unbounded *__unbounded ubp_envp;
@@ -51,15 +52,17 @@ __execve (file, argv, envp)
;
i = v - argv + 1;
ubp_argv = (char *__unbounded *__unbounded) alloca (sizeof (*ubp_argv) * i);
- for (v = argv, ubp_v = ubp_argv; i--; v++, ubp_v++)
+ for (v = argv, ubp_v = ubp_argv; --i; v++, ubp_v++)
*ubp_v = CHECK_STRING (*v);
+ *ubp_v = 0;
for (v = envp; *v; v++)
;
i = v - envp + 1;
ubp_envp = (char *__unbounded *__unbounded) alloca (sizeof (*ubp_envp) * i);
- for (v = envp, ubp_v = ubp_envp; i--; v++, ubp_v++)
+ for (v = envp, ubp_v = ubp_envp; --i; v++, ubp_v++)
*ubp_v = CHECK_STRING (*v);
+ *ubp_v = 0;
return INLINE_SYSCALL (execve, 3, CHECK_STRING (file), ubp_argv, ubp_envp);
}