Merge pull request #9 from shadow-maint/idmapleak

Idmapleak
shadow-maint · Nov 13, 2015 · 4c4896f · 4c4896f
2 parents 5fadb34 + 533d2ba
commit 4c4896f
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/libmisc/idmapping.c b/libmisc/idmapping.c
@@ -70,13 +70,19 @@ struct map_range *get_map_ranges(int ranges, int argc, char **argv)
 
 	/* Gather up the ranges from the command line */
 	mapping = mappings;
-	for (idx = 0; idx < ranges; idx++, argidx += 3, mapping++) {
-		if (!getulong(argv[argidx + 0], &mapping->upper))
+	for (idx = 0, argidx = 0; idx < ranges; idx++, argidx += 3, mapping++) {
+		if (!getulong(argv[argidx + 0], &mapping->upper)) {
+			free(mappings);
 			return NULL;
-		if (!getulong(argv[argidx + 1], &mapping->lower))
+		}
+		if (!getulong(argv[argidx + 1], &mapping->lower)) {
+			free(mappings);
 			return NULL;
-		if (!getulong(argv[argidx + 2], &mapping->count))
+		}
+		if (!getulong(argv[argidx + 2], &mapping->count)) {
+			free(mappings);
 			return NULL;
+		}
 	}
 	return mappings;
 }