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>
This commit is contained in:

committed by
Junio C Hamano

parent
98c6d16d67
commit
aa9f618909
@ -4983,6 +4983,9 @@ redo:
|
||||
|
||||
if (result->clean >= 0) {
|
||||
result->tree = parse_tree_indirect(&working_tree_oid);
|
||||
if (!result->tree)
|
||||
die(_("unable to read tree (%s)"),
|
||||
oid_to_hex(&working_tree_oid));
|
||||
/* existence of conflicted entries implies unclean */
|
||||
result->clean &= strmap_empty(&opt->priv->conflicted);
|
||||
}
|
||||
|
Reference in New Issue
Block a user