summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpanda <daniel.phan36@gmail.com>2021-02-18 16:36:42 -0800
committerpanda <daniel.phan36@gmail.com>2021-02-18 16:37:29 -0800
commit409305081372c7e881dfa8f35a2696366abc712b (patch)
treeedfdd5ce8d336de19f2da2e10c39491845a95c18
parent21981f28627b65d43590166b6a1782bb101dcddd (diff)
downloadlibgit2-409305081372c7e881dfa8f35a2696366abc712b.tar.gz
index: Initialize case_sorted to GIT_VECTOR_INIT
This is for extra safety within write_entries
-rw-r--r--src/index.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/index.c b/src/index.c
index 263f8e586..3d46030f7 100644
--- a/src/index.c
+++ b/src/index.c
@@ -2861,7 +2861,7 @@ static int write_entries(git_index *index, git_filebuf *file)
{
int error = 0;
size_t i;
- git_vector case_sorted, *entries;
+ git_vector case_sorted = GIT_VECTOR_INIT, *entries = NULL;
git_index_entry *entry;
const char *last = NULL;
@@ -2869,7 +2869,7 @@ static int write_entries(git_index *index, git_filebuf *file)
* to re-sort it case-sensitively before writing */
if (index->ignore_case) {
if ((error = git_vector_dup(&case_sorted, &index->entries, git_index_entry_cmp)) < 0)
- return error;
+ goto done;
git_vector_sort(&case_sorted);
entries = &case_sorted;
@@ -2887,9 +2887,8 @@ static int write_entries(git_index *index, git_filebuf *file)
last = entry->path;
}
- if (index->ignore_case)
- git_vector_free(&case_sorted);
-
+done:
+ git_vector_free(&case_sorted);
return error;
}