proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-11-04 14:08:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't walk off the end of the index

Browse Source
This commit is contained in:
Edward Thomson 2012-12-12 17:54:12 -06:00
parent 6cacd44bd0
commit e759b07217
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/index.c
View File

@ -957,13 +957,14 @@ int git_index_conflict_remove(git_index *index, const char *path)
continue; continue;
} }
error = git_vector_remove(&index->entries, (unsigned int)pos); if ((error = git_vector_remove(&index->entries, (unsigned int)pos)) < 0)
return error;
if (error >= 0)
index_entry_free(conflict_entry); index_entry_free(conflict_entry);
posmax--;
} }
return error; return 0;
} }
static int index_conflicts_match(const git_vector *v, size_t idx) static int index_conflicts_match(const git_vector *v, size_t idx)