diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-22 12:34:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-22 12:34:10 -0700 |
| commit | 1b01cdbf2e65331879a4668880a191dfac953761 (patch) | |
| tree | 35a31e23ac1569298371f67b266067df75166cc2 /cache-tree.c | |
| parent | 8aa76abba5e97449740d2e26d57542166f385b4d (diff) | |
| parent | 5aa02f98685d78666293149087d3f69b97528cfb (diff) | |
| download | git-1b01cdbf2e65331879a4668880a191dfac953761.tar.gz | |
Merge branch 'jk/tree-walk-overflow'
Codepaths to walk tree objects have been audited for integer
overflows and hardened.
* jk/tree-walk-overflow:
tree-walk: harden make_traverse_path() length computations
tree-walk: add a strbuf wrapper for make_traverse_path()
tree-walk: accept a raw length for traverse_path_len()
tree-walk: use size_t consistently
tree-walk: drop oid from traverse_info
setup_traverse_info(): stop copying oid
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cache-tree.c b/cache-tree.c index 706ffcf188..c22161f987 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -713,7 +713,7 @@ static struct cache_tree *find_cache_tree_from_traversal(struct cache_tree *root if (!info->prev) return root; our_parent = find_cache_tree_from_traversal(root, info->prev); - return cache_tree_find(our_parent, info->name.path); + return cache_tree_find(our_parent, info->name); } int cache_tree_matches_traversal(struct cache_tree *root, |