From 3ea6b85a871aa41eaa66a2919451ad12d492c355 Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Sat, 15 Jul 2017 20:15:26 +0200 Subject: notes: don't access hash of NULL object_id pointer Check if note is NULL, as we already do for different purposes a few lines above, and pass a NULL pointer to prepare_note_data() in that case instead of trying to access the hash member. Found with Clang's UBSan. Signed-off-by: Rene Scharfe Acked-by: Brandon Williams Signed-off-by: Junio C Hamano --- builtin/notes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin') diff --git a/builtin/notes.c b/builtin/notes.c index 2ebc2b7c43..3d9dbc97a1 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -453,7 +453,7 @@ static int add(int argc, const char **argv, const char *prefix) oid_to_hex(&object)); } - prepare_note_data(&object, &d, note->hash); + prepare_note_data(&object, &d, note ? note->hash : NULL); if (d.buf.len || allow_empty) { write_note_data(&d, new_note.hash); if (add_note(t, &object, &new_note, combine_notes_overwrite)) -- cgit v1.3 From f730944a49b2a210bb10520700c0a3f6c49bc020 Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Sat, 15 Jul 2017 20:33:54 +0200 Subject: receive-pack: don't access hash of NULL object_id pointer We set old_oid to NULL if we found out that it's a corrupt reference. In that case don't try to access the hash member and pass NULL to ref_transaction_delete() instead. Found with Clang's UBSan. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- builtin/receive-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin') diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index b1706a5731..f589e8aebf 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1137,7 +1137,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) } if (ref_transaction_delete(transaction, namespaced_name, - old_oid->hash, + old_oid ? old_oid->hash : NULL, 0, "push", &err)) { rp_error("%s", err.buf); strbuf_release(&err); -- cgit v1.3