39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
Signed-off-by: Tobias Stoeckmann <tobias at stoeckmann.org>
|
|
---
|
|
xinit.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/xinit.c b/xinit.c
|
|
index f826b7a..8efd0be 100644
|
|
--- xinit.c
|
|
+++ xinit.c
|
|
@@ -151,7 +151,6 @@ main(int argc, char *argv[])
|
|
register char **ptr;
|
|
pid_t pid;
|
|
int client_given = 0, server_given = 0;
|
|
- int client_args_given = 0, server_args_given = 0;
|
|
int start_of_client_args, start_of_server_args;
|
|
struct sigaction sa, si;
|
|
#ifdef __APPLE__
|
|
@@ -174,7 +173,8 @@ main(int argc, char *argv[])
|
|
}
|
|
start_of_client_args = (cptr - client);
|
|
while (argc && strcmp(*argv, "--")) {
|
|
- client_args_given++;
|
|
+ if (cptr > clientargv + 98)
|
|
+ Fatalx("too many client arguments");
|
|
*cptr++ = *argv++;
|
|
argc--;
|
|
}
|
|
@@ -202,7 +202,8 @@ main(int argc, char *argv[])
|
|
|
|
start_of_server_args = (sptr - server);
|
|
while (--argc >= 0) {
|
|
- server_args_given++;
|
|
+ if (sptr > serverargv + 98)
|
|
+ Fatalx("too many server arguments");
|
|
*sptr++ = *argv++;
|
|
}
|
|
*sptr = NULL;
|
|
--
|
|
2.20.1
|