From: zacheiss <zacheiss>
Date: Mon, 27 Aug 2007 15:22:15 +0000 (+0000)
Subject: Don't crash if given more than MAXARGS arguments.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/2d84b01c3830bac5f50c4a124419857ce8f4db34

Don't crash if given more than MAXARGS arguments.
---

diff --git a/clients/mrtest/mrtest.c b/clients/mrtest/mrtest.c
index 127e4d62..6055b7f9 100644
--- a/clients/mrtest/mrtest.c
+++ b/clients/mrtest/mrtest.c
@@ -259,8 +259,14 @@ int parse(char *buf, char *argv[MAXARGS])
 	  /* skip whitespace */
 	  for (*p++ = '\0'; *p == ' ' || *p == '\t'; p++)
 	    ;
-	  if (*p && *p != '\n')
-	    argv[++argc] = p--;
+	  if (*p && *p != '\n') {
+	    if (++argc >= MAXARGS) {
+	      fprintf(stderr,
+		      "moira: Too many command line arguments\n");
+	      return 0;
+	    }
+	    argv[argc] = p--;
+	  }
 	}
     }
   if (*p == '\n')