Merge pull request #1095 from niukuo/panic_find_entry

fix panic in object.Tree.FindEntry
src-d · Apr 2, 2019 · 923642a · 923642a
2 parents 6e931e4 + 579399e
commit 923642a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/plumbing/object/tree.go b/plumbing/object/tree.go
@@ -135,7 +135,7 @@ func (t *Tree) FindEntry(path string) (*TreeEntry, error) {
 	pathCurrent := ""
 
 	// search for the longest path in the tree path cache
-	for i := len(pathParts); i > 1; i-- {
+	for i := len(pathParts) - 1; i > 1; i-- {
 		path := filepath.Join(pathParts[:i]...)
 
 		tree, ok := t.t[path]

diff --git a/plumbing/object/tree_test.go b/plumbing/object/tree_test.go
@@ -125,6 +125,9 @@ func (s *TreeSuite) TestFindEntryNotFound(c *C) {
 	e, err := s.Tree.FindEntry("not-found")
 	c.Assert(e, IsNil)
 	c.Assert(err, Equals, ErrEntryNotFound)
+	e, err = s.Tree.FindEntry("not-found/not-found/not-found")
+	c.Assert(e, IsNil)
+	c.Assert(err, Equals, ErrDirectoryNotFound)
 }
 
 // Overrides returned plumbing.EncodedObject for given hash.