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

pack-objects: unlock the cache on integer overflow

Browse Source
This commit is contained in:
Edward Thomson 2015-02-13 09:35:20 -05:00
parent d97d9559e3
commit 0f07d54b44
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/pack-objects.c
View File

@ -832,13 +832,14 @@ static int try_delta(git_packbuilder *pb, struct unpacked *trg,
trg_object->delta_data = NULL; trg_object->delta_data = NULL;
} }
if (delta_cacheable(pb, src_size, trg_size, delta_size)) { if (delta_cacheable(pb, src_size, trg_size, delta_size)) {
if (git__add_uint64_overflow(&pb->delta_cache_size, pb->delta_cache_size, delta_size)) bool overflow = git__add_uint64_overflow(
return -1; &pb->delta_cache_size, pb->delta_cache_size, delta_size);
git_packbuilder__cache_unlock(pb); git_packbuilder__cache_unlock(pb);
trg_object->delta_data = git__realloc(delta_buf, delta_size); if (overflow ||
GITERR_CHECK_ALLOC(trg_object->delta_data); !(trg_object->delta_data = git__realloc(delta_buf, delta_size)))
return -1;
} else { } else {
/* create delta when writing the pack */ /* create delta when writing the pack */
git_packbuilder__cache_unlock(pb); git_packbuilder__cache_unlock(pb);