revparse: handle a non-existent path in the colon syntax

oid_for_tree_path may not always find the path in the tree, in which
case we need to return an error. The current code doesn't do this and
results in undefined behavior.
This commit is contained in:
Carlos Martín Nieto 2012-06-19 23:36:36 +02:00
parent 1b0ef5aa03
commit 053b509668

View File

@ -567,6 +567,7 @@ static int handle_colon_syntax(git_object **out,
{
git_tree *tree;
git_oid oid;
int error;
/* Dereference until we reach a tree. */
if (dereference_to_type(&obj, obj, GIT_OBJ_TREE) < 0) {
@ -575,8 +576,12 @@ static int handle_colon_syntax(git_object **out,
tree = (git_tree*)obj;
/* Find the blob at the given path. */
oid_for_tree_path(&oid, tree, repo, path);
error = oid_for_tree_path(&oid, tree, repo, path);
git_tree_free(tree);
if (error < 0)
return error;
return git_object_lookup(out, repo, &oid, GIT_OBJ_ANY);
}