diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:26:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:26:18 -0700 |
| commit | ce4d4e763c054788550625502553ced8810a7bce (patch) | |
| tree | 6ea3d887f7cff3c48eb694b9535da0a919b218bd /tree-diff.c | |
| parent | 833e48259e23aea76f3765d28d1b2200332301f7 (diff) | |
| parent | e568e563ade00bbb0937162f405fc160f253e224 (diff) | |
| download | git-ce4d4e763c054788550625502553ced8810a7bce.tar.gz git-ce4d4e763c054788550625502553ced8810a7bce.tar.xz | |
Merge branch 'maint-2.5' into maint-2.6
* maint-2.5:
Git 2.5.5
Git 2.4.11
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tree-diff.c b/tree-diff.c index 290a1da4c..4dda9a14a 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -124,8 +124,8 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last, unsigned mode, const unsigned char *sha1) { struct combine_diff_path *p; - int len = base->len + pathlen; - int alloclen = combine_diff_path_size(nparent, len); + size_t len = st_add(base->len, pathlen); + size_t alloclen = combine_diff_path_size(nparent, len); /* if last->next is !NULL - it is a pre-allocated memory, we can reuse */ p = last->next; |