Validate pointer before access the member.

When Git repository at network locations, sometimes git_iterator_for_tree
fails at iterator__update_ignore_case so it goes to git_iterator_free.
Null pointer will crash the process if not check.

Signed-off-by: Colin Xu <colin.xu@gmail.com>
This commit is contained in:
Colin Xu 2016-01-22 16:03:37 +08:00 committed by Edward Thomson
parent 4be2aa57c9
commit a218b2f625

View File

@ -558,7 +558,7 @@ static bool tree_iterator__pop_frame(tree_iterator *ti, bool final)
{ {
tree_iterator_frame *tf = ti->head; tree_iterator_frame *tf = ti->head;
if (!tf->up) if (!tf || !tf->up)
return false; return false;
ti->head = tf->up; ti->head = tf->up;
@ -581,7 +581,8 @@ static void tree_iterator__pop_all(tree_iterator *ti, bool to_end, bool final)
while (tree_iterator__pop_frame(ti, final)) /* pop to root */; while (tree_iterator__pop_frame(ti, final)) /* pop to root */;
if (!final) { if (!final) {
ti->head->current = to_end ? ti->head->n_entries : 0; if(ti->head)
ti->head->current = to_end ? ti->head->n_entries : 0;
ti->path_ambiguities = 0; ti->path_ambiguities = 0;
git_buf_clear(&ti->path); git_buf_clear(&ti->path);
} }
@ -775,7 +776,8 @@ static void tree_iterator__free(git_iterator *self)
tree_iterator__pop_all(ti, true, false); tree_iterator__pop_all(ti, true, false);
git_tree_free(ti->head->entries[0]->tree); if(ti->head)
git_tree_free(ti->head->entries[0]->tree);
git__free(ti->head); git__free(ti->head);
git_pool_clear(&ti->pool); git_pool_clear(&ti->pool);
git_buf_free(&ti->path); git_buf_free(&ti->path);