kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2019-09-30 13:19:25 +09:00
parent 37801f0665 60fe477a0b
commit 74a39b9bcc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
notes.c
View File

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


ret = combine_notes(&l->val_oid, ret = combine_notes(&l->val_oid,
&entry->val_oid); &entry->val_oid);
@ -458,7 +460,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
die("Failed to load %s %s into notes tree " die("Failed to load %s %s into notes tree "
"from %s", "from %s",
type == PTR_TYPE_NOTE ? "note" : "subtree", type == PTR_TYPE_NOTE ? "note" : "subtree",
oid_to_hex(&l->key_oid), t->ref); oid_to_hex(&object_oid), t->ref);


continue; continue;