mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/cache-tree-protect-from-broken-libgit2'

Browse Source 
The code to use cache-tree trusted the on-disk data too much
and fell into an infinite loop.

* jk/cache-tree-protect-from-broken-libgit2:
  cache-tree: avoid infinite loop on zero-entry tree
This commit is contained in:
Junio C Hamano
2014-11-06 10:51:35 -08:00
parent f745acb028 729dbbd9fc
commit e44da1bbb8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache-tree.c
View File

@ -303,6 +303,8 @@ static int update_one(struct cache_tree *it,
flags); flags);
if (subcnt < 0) if (subcnt < 0)
return subcnt; return subcnt;
if (!subcnt)
die("index cache-tree records empty sub-tree");
i += subcnt; i += subcnt;
sub->count = subcnt; /* to be used in the next loop */ sub->count = subcnt; /* to be used in the next loop */
*skip_count += subskip; *skip_count += subskip;