diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-04 02:11:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-04 14:24:28 -0800 |
| commit | 0fb1eaa8850557249a8d1c43a4f0f3ac5a5f75ce (patch) | |
| tree | bf8b7fbba3c6077b9bad3c98ca1456ec46a5d24c | |
| parent | 562cefbdbfaeb92f91c961c67960a93a7772220c (diff) | |
| download | git-0fb1eaa8850557249a8d1c43a4f0f3ac5a5f75ce.tar.gz git-0fb1eaa8850557249a8d1c43a4f0f3ac5a5f75ce.tar.xz | |
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>
| -rw-r--r-- | unpack-trees.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 7cfd628d8..47aa804a8 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -370,7 +370,7 @@ int unpack_trees(struct object_list *trees, struct unpack_trees_options *o) int i; struct object_list *posn = trees; struct tree_entry_list df_conflict_list; - struct cache_entry df_conflict_entry; + static struct cache_entry *dfc; memset(&df_conflict_list, 0, sizeof(df_conflict_list)); df_conflict_list.next = &df_conflict_list; @@ -381,8 +381,10 @@ int unpack_trees(struct object_list *trees, struct unpack_trees_options *o) state.refresh_cache = 1; o->merge_size = len; - memset(&df_conflict_entry, 0, sizeof(df_conflict_entry)); - o->df_conflict_entry = &df_conflict_entry; + + if (!dfc) + dfc = xcalloc(1, sizeof(struct cache_entry) + 1); + o->df_conflict_entry = dfc; if (len) { posns = xmalloc(len * sizeof(struct tree_entry_list *)); |