diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2007-12-17 22:12:03 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-12-18 01:10:24 -0800 |
| commit | f2fdd10ab76feb0e141fc3f9cf4e5efd87f7fcdf (patch) | |
| tree | 3a50b7992f03995b41eecde0341d817bb4c29041 /diffcore-delta.c | |
| parent | Fix segfault in diff-delta.c when FLEX_ARRAY is 1 (diff) | |
| download | tgif-f2fdd10ab76feb0e141fc3f9cf4e5efd87f7fcdf.tar.xz | |
unpack-trees: FLEX_ARRAY fix
In unpack-trees.c (line 593), we do
..
if (same(old, merge)) {
*merge = *old;
} else {
..
and that "merge" is a cache_entry pointer. If we have a non-zero
FLEX_ARRAY size, it will cause us to copy the first few bytes of the
name too.
That is technically wrong even for FLEX_ARRAY being 1, but you'll never
notice, since the filenames should always be the same with the current
code. But if we do the same thing for a rename, we'd be screwed.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-delta.c')
0 files changed, 0 insertions, 0 deletions