Merge branch 'as/shallow-slab-use-fix'

gitster · gitster · commit 678a9ca62940 · 2019-10-09T14:00:59.000+09:00
Correct code that tried to reference all entries in a sparse array
of pointers by mistake.

* as/shallow-slab-use-fix:
  shallow.c: don't free unallocated slabs
diff --git 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]);
 	}

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,8 @@ struct commit_list get_shallow_commits(struct object_array heads, int depth,`
`156`	`156`	`for (i = 0; i < depths.slab_count; i++) {`
`157`	`157`	`int j;`
`158`	`158`
	`159`	`+ if (!depths.slab[i])`
	`160`	`+ continue;`
`159`	`161`	`for (j = 0; j < depths.slab_size; j++)`
`160`	`162`	`free(depths.slab[i][j]);`
`161`	`163`	`}`