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

Merge pull request #3559 from yongthecoder/master

Browse Source 
Add a sanity check in git_indexer_commit to avoid subtraction overflow.
This commit is contained in:
Carlos Martín Nieto 2016-03-22 01:54:49 -07:00
commit e50a49ee9b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/indexer.c
View File

@ -914,12 +914,17 @@ int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats)
git_filebuf index_file = {0}; git_filebuf index_file = {0};
void *packfile_trailer; void *packfile_trailer;
if (!idx->parsed_header) {
giterr_set(GITERR_INDEXER, "incomplete pack header");
return -1;
}
if (git_hash_ctx_init(&ctx) < 0) if (git_hash_ctx_init(&ctx) < 0)
return -1; return -1;
/* Test for this before resolve_deltas(), as it plays with idx->off */ /* Test for this before resolve_deltas(), as it plays with idx->off */
if (idx->off < idx->pack->mwf.size - 20) { if (idx->off + 20 < idx->pack->mwf.size) {
giterr_set(GITERR_INDEXER, "Unexpected data at the end of the pack"); giterr_set(GITERR_INDEXER, "unexpected data at the end of the pack");
return -1; return -1;
} }