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 /reset.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 'reset.c')
| -rw-r--r-- | reset.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -158,6 +158,11 @@ int reset_head(struct repository *r, const struct reset_head_opts *opts) } tree = parse_tree_indirect(oid); + if (!tree) { + ret = error(_("unable to read tree (%s)"), oid_to_hex(oid)); + goto leave_reset_head; + } + prime_cache_tree(r, r->index, tree); if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0) { |