diff mbox series

[v2,01/19] diff: use hashmap_entry_init on moved_entry.ent

Message ID	20190924010324.22619-2-e@80x24.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=oRGs=XT=vger.kernel.org=git-owner@kernel.org> From: Eric Wong <e@80x24.org> To: Junio C Hamano <gitster@pobox.com> Cc: Derrick Stolee <stolee@gmail.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de>, Phillip Wood <phillip.wood@dunelm.org.uk>, git@vger.kernel.org Subject: [PATCH v2 01/19] diff: use hashmap_entry_init on moved_entry.ent Date: Tue, 24 Sep 2019 01:03:06 +0000 Message-Id: <20190924010324.22619-2-e@80x24.org> In-Reply-To: <20190924010324.22619-1-e@80x24.org> References: <20190924010324.22619-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	[v2,01/19] diff: use hashmap_entry_init on moved_entry.ent \| expand [v2,01/19] diff: use hashmap_entry_init on moved_entry.ent [v2,02/19] coccicheck: detect hashmap_entry.hash assignment [v2,03/19] packfile: use hashmap_entry in delta_base_cache_entry [v2,04/19] hashmap_entry_init takes "struct hashmap_entry " [v2,05/19] hashmap_get_next takes "const struct hashmap_entry " [v2,06/19] hashmap_add takes "struct hashmap_entry " [v2,07/19] hashmap_get takes "const struct hashmap_entry " [v2,08/19] hashmap_remove takes "const struct hashmap_entry " [v2,09/19] hashmap_put takes "struct hashmap_entry " [v2,10/19] introduce container_of macro [v2,11/19] hashmap_get_next returns "struct hashmap_entry " [v2,12/19] hashmap: use _entry APIs to wrap container_of [v2,13/19] hashmap_get{,_from_hash} return "struct hashmap_entry " [v2,14/19] hashmap_cmp_fn takes hashmap_entry params [v2,15/19] hashmap: use _entry APIs for iteration [v2,16/19] hashmap: hashmap_{put,remove} return hashmap_entry * [v2,17/19] hashmap: introduce hashmap_free_entries [v2,18/19] OFFSETOF_VAR macro to simplify hashmap iterators [v2,19/19] hashmap: remove type arg from hashmap_{get,put,remove}_entry

Commit Message

Eric Wong Sept. 24, 2019, 1:03 a.m. UTC

Otherwise, the hashmap_entry.next field appears to remain
uninitialized, which can lead to problems when
add_lines_to_move_detection calls hashmap_add.

I found this through manual inspection when converting
hashmap_add callers to take "struct hashmap_entry *".

Signed-off-by: Eric Wong <e@80x24.org>
---
 diff.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/diff.c b/diff.c
index efe42b341a..02491ee684 100644
--- a/diff.c
+++ b/diff.c
@@ -964,8 +964,9 @@  static struct moved_entry *prepare_entry(struct diff_options *o,
 	struct moved_entry *ret = xmalloc(sizeof(*ret));
 	struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no];
 	unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS;
+	unsigned int hash = xdiff_hash_string(l->line, l->len, flags);
 
-	ret->ent.hash = xdiff_hash_string(l->line, l->len, flags);
+	hashmap_entry_init(&ret->ent, hash);
 	ret->es = l;
 	ret->next_line = NULL;