Merge branch 'nd/maint-parse-depth' into maint

* nd/maint-parse-depth: Catch invalid --depth option passed to clone or fetch
kblees · Jan 4, 2012 · 6ea9385 · 6ea9385
2 parents bc0fe84 + e7622ce
commit 6ea9385
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/transport.c b/transport.c
@@ -474,8 +474,12 @@ static int set_git_option(struct git_transport_options *opts,
 	} else if (!strcmp(name, TRANS_OPT_DEPTH)) {
 		if (!value)
 			opts->depth = 0;
-		else
-			opts->depth = atoi(value);
+		else {
+			char *end;
+			opts->depth = strtol(value, &end, 0);
+			if (*end)
+				die("transport: invalid depth option '%s'", value);
+		}
 		return 0;
 	}
 	return 1;