Merge pull request #265 from eriksjolund/handle-empty-basedir-option

mountcomposefs: Handle empty basedir option
containers · Mar 25, 2024 · 1179638 · 1179638
2 parents 301b78f + a96f786
commit 1179638
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tools/mountcomposefs.c b/tools/mountcomposefs.c
@@ -216,10 +216,12 @@ int main(int argc, char **argv)
 		if (options.objdirs == NULL)
 			errx(EXIT_FAILURE, "Out of memory\n");
 
-		for (i = 0, str = (char *)opt_basedir;; i++, str = NULL) {
+		for (i = 0, str = (char *)opt_basedir; i < options.n_objdirs;
+		     i++, str = NULL) {
 			token = strtok_r(str, ":", &saveptr);
 			if (token == NULL)
-				break;
+				errx(EXIT_FAILURE,
+				     "Value for basedir option has incorrect format\n");
 			options.objdirs[i] = token;
 		}
 	}