diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-02-23 08:34:23 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-02-23 10:19:40 -0800 |
commit | aa9f618909d30e3f0c7181243e89a81220507e6e (patch) | |
tree | eba8780bfd3266fc0fc9371a0e9024d92d04b036 /sequencer.c | |
parent | 98c6d16d6746059dc1e1183f8f8366eef2a41eff (diff) | |
download | git-aa9f618909d30e3f0c7181243e89a81220507e6e.tar.gz |
Always check `parse_tree*()`'s return value
Otherwise we may easily run into serious crashes: For example, if we run
`init_tree_desc()` directly after a failed `parse_tree()`, we are
accessing uninitialized data or trying to dereference `NULL`.
Note that the `parse_tree()` function already takes care of showing an
error message. The `parse_tree_indirectly()` and
`repo_get_commit_tree()` functions do not, therefore those latter call
sites need to show a useful error message while the former do not.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
-rw-r--r-- | sequencer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index d584cac8ed..33d12b2ffd 100644 --- a/sequencer.c +++ b/sequencer.c @@ -715,6 +715,8 @@ static int do_recursive_merge(struct repository *r, o.show_rename_progress = 1; head_tree = parse_tree_indirect(head); + if (!head_tree) + return error(_("unable to read tree (%s)"), oid_to_hex(head)); next_tree = next ? repo_get_commit_tree(r, next) : empty_tree(r); base_tree = base ? repo_get_commit_tree(r, base) : empty_tree(r); @@ -3887,6 +3889,8 @@ static int do_reset(struct repository *r, } tree = parse_tree_indirect(&oid); + if (!tree) + return error(_("unable to read tree (%s)"), oid_to_hex(&oid)); prime_cache_tree(r, r->index, tree); if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0) |