diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:40 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:40 -0800 |
commit | 3a27eec48ecfcc0764c90b3f478a124c01c082bc (patch) | |
tree | 792ef7ba9534ad1cc1a76a06cde16e8d8f3f3dd8 /builtin/merge-file.c | |
parent | Merge branch 'jc/am-3-fallback-regression-fix' into maint (diff) | |
parent | name-hash: don't reuse cache_entry in dir_entry (diff) | |
download | tgif-3a27eec48ecfcc0764c90b3f478a124c01c082bc.tar.xz |
Merge branch 'dt/name-hash-dir-entry-fix' into maint
The name-hash subsystem that is used to cope with case insensitive
filesystems keeps track of directories and their on-filesystem
cases for all the paths in the index by holding a pointer to a
randomly chosen cache entry that is inside the directory (for its
ce->ce_name component). This pointer was not updated even when the
cache entry was removed from the index, leading to use after free.
This was fixed by recording the path for each directory instead of
borrowing cache entries and restructuring the API somewhat.
* dt/name-hash-dir-entry-fix:
name-hash: don't reuse cache_entry in dir_entry
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions