diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-04 11:11:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-04 23:24:28 +0100 |
| commit | 0fb1eaa8850557249a8d1c43a4f0f3ac5a5f75ce (patch) | |
| tree | bf8b7fbba3c6077b9bad3c98ca1456ec46a5d24c /merge-tree.c | |
| parent | receive-pack: do not insist on fast-forward outside refs/heads/ (diff) | |
| download | git-0fb1eaa8850557249a8d1c43a4f0f3ac5a5f75ce.tar.xz git-0fb1eaa8850557249a8d1c43a4f0f3ac5a5f75ce.zip | |
unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
The structure that ends with a flexible array member (or 0
length array with older GCC) "char name[FLEX_ARRAY]" is
allocated on the stack and we use it after clearing its entire
size with memset. That does not guarantee that "name" is
properly NUL terminated as we intended on platforms with more
forgiving structure alignment requirements.
Reported breakage on m68k by Roman Zippel.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions