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 <[email protected]>
jsts · Feb 17, 2016 · a218b2f · a218b2f
1 parent 4be2aa5
commit a218b2f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/iterator.c b/src/iterator.c
@@ -558,7 +558,7 @@ static bool tree_iterator__pop_frame(tree_iterator *ti, bool final)
 {
 	tree_iterator_frame *tf = ti->head;
 
-	if (!tf->up)
+	if (!tf || !tf->up)
 		return false;
 
 	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 */;
 
 	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;
 		git_buf_clear(&ti->path);
 	}
@@ -775,7 +776,8 @@ static void tree_iterator__free(git_iterator *self)
 
 	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_pool_clear(&ti->pool);
 	git_buf_free(&ti->path);