X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=chmod_chown_chgrp.c;h=d3e267827a15506f226fb97d3ad822c2e5dd4de1;hb=9ebccb289154aba69cc87990d63f8ad3280e0674;hp=c0e380a8ebc7451e5ed1ad19e10167babf60e94f;hpb=6ca28ba65c1ca321ee517491eaadcdba60bc0b79;p=oweals%2Fbusybox.git

diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index c0e380a8e..d3e267827 100644
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -25,6 +25,7 @@
 #include "internal.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_invalid_option
+#define bb_need_too_few_args
 #include "messages.c"
 
 #include <stdio.h>
@@ -100,8 +101,8 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 int chmod_chown_chgrp_main(int argc, char **argv)
 {
 	int recursiveFlag = FALSE;
-	char *groupName;
-	char *p;
+	char *groupName=NULL;
+	char *p=NULL;
 	const char *appUsage;
 
 	whichApp = (strcmp(*argv, "chown") == 0)? 
@@ -114,24 +115,28 @@ int chmod_chown_chgrp_main(int argc, char **argv)
 	if (argc < 2)
 		usage(appUsage);
 	invocationName = *argv;
-	argc--;
 	argv++;
 
 	/* Parse options */
-	while (argc && (**argv == '-')) {
-		while (*++(*argv))
+	while (--argc >= 0 && *argv && (**argv == '-')) {
+		while (*++(*argv)) {
 			switch (**argv) {
-			case 'R':
-				recursiveFlag = TRUE;
-				break;
-			default:
-				fprintf(stderr, invalid_option, invocationName, **argv);
-				usage(appUsage);
+				case 'R':
+					recursiveFlag = TRUE;
+					break;
+				default:
+					fprintf(stderr, invalid_option, invocationName, **argv);
+					usage(appUsage);
 			}
-		argc--;
+		}
 		argv++;
 	}
 
+	if (argc == 0 || *argv == NULL) {
+		fprintf(stderr, too_few_args, invocationName);
+		usage(appUsage);
+	}
+
 	if (whichApp == CHMOD_APP) {
 		theMode = *argv;
 	} else {