@matheusbsbs / matheus-bagliano / commits / ae6f064fd7

notes: clean up confusing NULL checks in init_notes()

Coverity complains that we check whether "notes_ref" is NULL, but it was already implied to be non-NULL earlier in the function. And this is true; since b9342b3fd63 (refs: add array of ref namespaces, 2022-08-05), we call xstrdup(notes_ref) unconditionally, which would segfault if it was NULL. But that commit is actually doing the right thing. Even if NULL is passed into the function, we'll use default_notes_ref() as a fallback, which will never return NULL (it tries a few options, but its last resort is a string literal). Ironically, the "!notes_ref" check was added by the same commit that added the fallback: 709f79b0894 (Notes API: init_notes(): Initialize the notes tree from the given notes ref, 2010-02-13). So this check never did anything. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Apr 22, 2023 at 09:55 UTC ae6f064fd7f0925cc8985769750a1367a4c24194

1 file changed +2 -2

notes.c

+2 -2

@@ -1019,13 +1019,13 @@ void init_notes(struct notes_tree *t, const char *notes_ref,

1019 t->root = (struct int_node *) xcalloc(1, sizeof(struct int_node));

1020 t->first_non_note = NULL;

1021 t->prev_non_note = NULL;

1022 - t->ref = xstrdup_or_null(notes_ref);

1022 + t->ref = xstrdup(notes_ref);

1023 t->update_ref = (flags & NOTES_INIT_WRITABLE) ? t->ref : NULL;

1024 t->combine_notes = combine_notes;

1025 t->initialized = 1;

1026 t->dirty = 0;

1027

1028 - if (flags & NOTES_INIT_EMPTY || !notes_ref ||

1028 + if (flags & NOTES_INIT_EMPTY ||

1029 repo_get_oid_treeish(the_repository, notes_ref, &object_oid))

1030 return;

1031 if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))