Skip to content

Commit cb71a9c

Browse files
committed
merge: assert that we're passed sane parameters
1 parent 6e9fb04 commit cb71a9c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/merge.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3191,7 +3191,7 @@ int git_merge_analysis_for_ref(
31913191
int error = 0;
31923192
bool unborn;
31933193

3194-
assert(analysis_out && preference_out && repo && their_heads);
3194+
assert(analysis_out && preference_out && repo && their_heads && their_heads_len > 0);
31953195

31963196
if (their_heads_len != 1) {
31973197
giterr_set(GITERR_MERGE, "can only merge a single branch");
@@ -3273,7 +3273,7 @@ int git_merge(
32733273
unsigned int checkout_strategy;
32743274
int error = 0;
32753275

3276-
assert(repo && their_heads);
3276+
assert(repo && their_heads && their_heads_len > 0);
32773277

32783278
if (their_heads_len != 1) {
32793279
giterr_set(GITERR_MERGE, "can only merge a single branch");

0 commit comments

Comments
 (0)