mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpack-trees: FLEX_ARRAY fix

Browse Source 
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>
This commit is contained in:
Linus Torvalds
2007-12-17 22:12:03 -08:00
committed by Junio C Hamano
parent f9c5a80cdf
commit f2fdd10ab7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unpack-trees.c
View File

@ -590,7 +590,7 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
* a match. * a match.
*/ */
if (same(old, merge)) { if (same(old, merge)) {
*merge = *old; memcpy(merge, old, offsetof(struct cache_entry, name));
} else { } else {
verify_uptodate(old, o); verify_uptodate(old, o);
invalidate_ce_path(old); invalidate_ce_path(old);