proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 22:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1139 from ethomson/index_bugfix

Browse Source 
don't walk off the end of the index
This commit is contained in:
Ben Straub 2012-12-12 19:53:05 -08:00
commit ae0ddc6f02
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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)