X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=shallow.c;h=c33ab94bd780355711d557c8ced1a837a418dff9;hb=678a9ca629403b533da19da6772691cd68b1040d;hp=ce45297940d417e3454b08d3f0c29f5cc6d93658;hpb=2b312841a84fbfc4b761f7f9e050a6fbbbad2509;p=thirdparty%2Fgit.git

diff --git a/shallow.c b/shallow.c
index ce45297940..c33ab94bd7 100644
--- a/shallow.c
+++ b/shallow.c
@@ -156,6 +156,8 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
 	for (i = 0; i < depths.slab_count; i++) {
 		int j;
 
+		if (!depths.slab[i])
+			continue;
 		for (j = 0; j < depths.slab_size; j++)
 			free(depths.slab[i][j]);
 	}
@@ -248,7 +250,8 @@ static void check_shallow_file_for_update(struct repository *r)
 	if (r->parsed_objects->is_shallow == -1)
 		BUG("shallow must be initialized by now");
 
-	if (!stat_validity_check(r->parsed_objects->shallow_stat, git_path_shallow(the_repository)))
+	if (!stat_validity_check(r->parsed_objects->shallow_stat,
+				 git_path_shallow(r)))
 		die("shallow file has changed since we read it");
 }