diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-14 15:36:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-14 15:36:06 -0800 |
| commit | c59ba68ea7d1b4614fa964403a6c662dca0dd212 (patch) | |
| tree | ba54ccb735bf678d57407f9053f179867cc038f5 /builtin/notes.c | |
| parent | e8640231883b7988f9df79fc2ba5216f03116e5c (diff) | |
| parent | 568459bf5e97a4f61429e3bdd1f97b54b39a1383 (diff) | |
Merge branch 'js/check-null-from-read-object-file'
The code paths that call repo_read_object_file() have been
tightened to react to errors.
* js/check-null-from-read-object-file:
Always check the return value of `repo_read_object_file()`
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index e65cae0bcf..caf20fd5bd 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -716,9 +716,11 @@ static int append_edit(int argc, const char **argv, const char *prefix) struct strbuf buf = STRBUF_INIT; char *prev_buf = repo_read_object_file(the_repository, note, &type, &size); - if (prev_buf && size) + if (!prev_buf) + die(_("unable to read %s"), oid_to_hex(note)); + if (size) strbuf_add(&buf, prev_buf, size); - if (d.buf.len && prev_buf && size) + if (d.buf.len && size) append_separator(&buf); strbuf_insert(&d.buf, 0, buf.buf, buf.len); |