summaryrefslogtreecommitdiff
path: root/list-objects.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-17 09:55:54 -0700
committerJunio C Hamano <gitster@pobox.com>2016-03-17 11:22:24 -0700
commit32c6dca8c428672c11a2a0ddf3cb2f7476caff86 (patch)
tree4b4f7532ab4b0be6b2b59d7ff4cf09956b5987fd /list-objects.h
parenta2558fb8e1e387b630312311e1d22c95663da5d0 (diff)
parent2824e1841b99393d2469c495253d547c643bd8f1 (diff)
downloadgit-32c6dca8c428672c11a2a0ddf3cb2f7476caff86.tar.gz
Merge branch 'jk/path-name-safety-2.4' into maint-2.4
Bugfix patches were backported from the 'master' front to plug heap corruption holes, to catch integer overflow in the computation of pathname lengths, and to get rid of the name_path API. Both of these would have resulted in writing over an under-allocated buffer when formulating pathnames while tree traversal. * jk/path-name-safety-2.4: 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 'list-objects.h')
-rw-r--r--list-objects.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/list-objects.h b/list-objects.h
index 136a1da5a6..0cebf8585c 100644
--- a/list-objects.h
+++ b/list-objects.h
@@ -2,7 +2,7 @@
#define LIST_OBJECTS_H
typedef void (*show_commit_fn)(struct commit *, void *);
-typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *, void *);
+typedef void (*show_object_fn)(struct object *, const char *, void *);
void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
typedef void (*show_edge_fn)(struct commit *);