Merge pull request #2 from biergaizi/upstream

[cctools] fix ar(1) crash without argument
grobian · May 29, 2023 · 0d77d50 · 0d77d50
2 parents de3eb17 + 86d7771
commit 0d77d50
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cctools/ar/ar.c b/cctools/ar/ar.c
@@ -123,12 +123,12 @@ main(argc, argv)
 	run_ranlib = 1;
 
 	if (argc < 3) {
-	   if(strcmp(argv[1], "--version") == 0){
+	   if(argc >= 2 && strcmp(argv[1], "--version") == 0){
 		/* Implement a gnu-style --version to be friendly to GCC.  */
 		fprintf(stdout, "xtools-%s ar %s\nBased on Apple Inc. %s\n",
 		        xtools_version, package_version, apple_version);
 		exit(0);
-	   } else if(strcmp(argv[1], "--help") == 0){
+	   } else if(argc >= 2 && strcmp(argv[1], "--help") == 0){
 		usage(0);
 		fprintf(stdout, "Please report bugs to %s\n", support_url);
 		exit(0);