From fef194d740bdc3a139dcc3c56e8cfd55261dc308 Mon Sep 17 00:00:00 2001 From: tjr Date: Sun, 12 Oct 2003 00:27:55 +0000 Subject: Fix BSS buffer overflow in makeargv(). --- usr.bin/tftp/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr.bin/tftp') diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index d4fc7c8..08a7f13 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -85,7 +85,8 @@ int connected; char mode[32]; char line[MAXLINE]; int margc; -char *margv[20]; +#define MAX_MARGV 20 +char *margv[MAX_MARGV]; jmp_buf toplevel; volatile int txrx_error; @@ -719,7 +720,7 @@ makeargv() margc = 0; if ((cp = strchr(line, '\n'))) *cp = '\0'; - for (cp = line; *cp;) { + for (cp = line; margc < MAX_MARGV - 1 && *cp;) { while (isspace(*cp)) cp++; if (*cp == '\0') -- cgit v1.1