Explorar el Código

getopt: fix null pointer arithmetic ub

When an option that requires an argument is the last character of
argv[argc-1], getopt computes argv[argc] + optpos. While optpos
is always zero in this case, adding it to null pointer is still
undefined.
Alexey Izbyshev hace 2 años
padre
commit
6d322159c6
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. 2 1
      src/misc/getopt.c

+ 2 - 1
src/misc/getopt.c

@@ -87,7 +87,8 @@ int getopt(int argc, char * const argv[], const char *optstring)
 	if (optstring[i] == ':') {
 		optarg = 0;
 		if (optstring[i+1] != ':' || optpos) {
-			optarg = argv[optind++] + optpos;
+			optarg = argv[optind++];
+			if (optpos) optarg += optpos;
 			optpos = 0;
 		}
 		if (optind > argc) {