aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2009-06-06 16:43:37 +0800
committerJunio C Hamano <gitster@pobox.com>2009-06-06 10:56:27 -0700
commit1b1b7b235b040f27952d48ab8811c958a1f6d052 (patch)
tree8a52bd8bb8f65fae50e0d43013c2218f7fd25249
parent20cfb3aa710d302829a776d7fbad2b89f71f15b6 (diff)
downloadgit-1b1b7b235b040f27952d48ab8811c958a1f6d052.tar.gz
git-1b1b7b235b040f27952d48ab8811c958a1f6d052.tar.xz
http-push: do not SEGV after fetching a bad pack idx file
In a70c232 ("http-fetch: do not SEGV after fetching a bad pack idx file"), changes were made to the setup_index method in http-fetch.c (known in its present form as http-walker.c after 30ae764 ("Modularize commit-walker")). Since http-push.c has similar similar code for processing index files, these changes should apply to http-push.c's implementation of setup_index as well. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--http-push.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/http-push.c b/http-push.c
index 82018009f..281e153eb 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1065,6 +1065,8 @@ static int setup_index(unsigned char *sha1)
return -1;
new_pack = parse_pack_index(sha1);
+ if (!new_pack)
+ return -1; /* parse_pack_index() already issued error message */
new_pack->next = repo->packs;
repo->packs = new_pack;
return 0;