Browse Source

notes: avoid leaking duplicate entries

When add_note is called multiple times with the same key/value pair, the
leaf_node it creates is leaked by notes_tree_insert.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Mike Hommey 6 years ago committed by Junio C Hamano
parent
commit
779ad6641b
  1. 4
      notes.c

4
notes.c

@ -269,8 +269,10 @@ static int note_tree_insert(struct notes_tree *t, struct int_node *tree, @@ -269,8 +269,10 @@ static int note_tree_insert(struct notes_tree *t, struct int_node *tree,
case PTR_TYPE_NOTE:
if (oideq(&l->key_oid, &entry->key_oid)) {
/* skip concatenation if l == entry */
if (oideq(&l->val_oid, &entry->val_oid))
if (oideq(&l->val_oid, &entry->val_oid)) {
free(entry);
return 0;
}

ret = combine_notes(&l->val_oid,
&entry->val_oid);

Loading…
Cancel
Save