diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:24:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:24:14 -0700 |
| commit | c638f3e4d585008f630d7dd8bb902f44217455b3 (patch) | |
| tree | 1772afa44a4b0878c94824762684866b24a12ee1 /tree-diff.c | |
| parent | 24358560c3c0ab51c9ef8178d99f46711716f6c0 (diff) | |
| parent | 765428699a5381f113d19974720bc91b5bfeaf1d (diff) | |
| download | git-c638f3e4d585008f630d7dd8bb902f44217455b3.tar.gz | |
Merge branch 'maint-2.4' into maint-2.5
* maint-2.4:
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 290a1da4ce..4dda9a14ab 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; |