diff options
| author | Etienne Samson <samson.etienne@gmail.com> | 2018-08-26 18:34:46 +0200 |
|---|---|---|
| committer | Etienne Samson <samson.etienne@gmail.com> | 2018-10-19 20:39:17 +0200 |
| commit | cb71a9cec2e5b857c18aea678664c5f2e65c8308 (patch) | |
| tree | 4463818d227c0bc9928c6eda94dd89f3a31d67f8 | |
| parent | 6e9fb040d9ea521f855257736369f42463cc45e8 (diff) | |
| download | libgit2-cb71a9cec2e5b857c18aea678664c5f2e65c8308.tar.gz | |
merge: assert that we're passed sane parameters
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index 547a65f85..8855a2663 100644 --- a/src/merge.c +++ b/src/merge.c @@ -3191,7 +3191,7 @@ int git_merge_analysis_for_ref( int error = 0; bool unborn; - assert(analysis_out && preference_out && repo && their_heads); + assert(analysis_out && preference_out && repo && their_heads && their_heads_len > 0); if (their_heads_len != 1) { giterr_set(GITERR_MERGE, "can only merge a single branch"); @@ -3273,7 +3273,7 @@ int git_merge( unsigned int checkout_strategy; int error = 0; - assert(repo && their_heads); + assert(repo && their_heads && their_heads_len > 0); if (their_heads_len != 1) { giterr_set(GITERR_MERGE, "can only merge a single branch"); |