Merge branch 'mh/notes-duplicate-entries'

A few implementation fixes in the notes API.

* mh/notes-duplicate-entries:
notes: avoid potential use-after-free during insertion
notes: avoid leaking duplicate entries

diff --combined notes.c
index 75c028b3005a8af8f39e9bceb7ab6e4b3b5dff83,9533a14a13394d988e96e38c44163b4f71768ab7..03e7d0cd2ddaf623fd41d4969348c624beee56d5
--- 1/notes.c
--- 2/notes.c
+++ b/notes.c
@@@ -269,8 -269,10 +269,10 @@@ static int note_tree_insert(struct note
                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);
@@@ -397,7 -399,7 +399,7 @@@ static void load_subtree(struct notes_t
        struct name_entry entry;
        const unsigned hashsz = the_hash_algo->rawsz;
  
 -      buf = fill_tree_descriptor(&desc, &subtree->val_oid);
 +      buf = fill_tree_descriptor(the_repository, &desc, &subtree->val_oid);
        if (!buf)
                die("Could not read %s for notes-index",
                     oid_to_hex(&subtree->val_oid));
@@@ -458,7 -460,7 +460,7 @@@
                        die("Failed to load %s %s into notes tree "
                            "from %s",
                            type == PTR_TYPE_NOTE ? "note" : "subtree",
-                           oid_to_hex(&l->key_oid), t->ref);
+                           oid_to_hex(&object_oid), t->ref);
  
                continue;
  
@@@ -1015,7 -1017,7 +1017,7 @@@ void init_notes(struct notes_tree *t, c
                return;
        if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))
                die("Cannot use notes ref %s", notes_ref);
 -      if (get_tree_entry(&object_oid, "", &oid, &mode))
 +      if (get_tree_entry(the_repository, &object_oid, "", &oid, &mode))
                die("Failed to read notes tree referenced by %s (%s)",
                    notes_ref, oid_to_hex(&object_oid));