diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-19 11:28:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-19 11:28:06 -0700 |
| commit | 679639904da05f7d84e9215960e76dd0f3353328 (patch) | |
| tree | a60e891d49b1de93d135fd5d79171f4c09b98040 /http-walker.c | |
| parent | 03db4525d38119f7778d6e9117f27c47db8466d4 (diff) | |
| parent | a1b6fb04b1c1b581dfac5c13641af8b3ae44810f (diff) | |
| download | git-679639904da05f7d84e9215960e76dd0f3353328.tar.gz | |
Merge branch 'maint'
* maint:
GIT 1.5.6.4
builtin-rm: fix index lock file path
http-fetch: do not SEGV after fetching a bad pack idx file
rev-list: honor --quiet option
api-run-command.txt: typofix
Diffstat (limited to 'http-walker.c')
| -rw-r--r-- | http-walker.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/http-walker.c b/http-walker.c index 51c18f2685..9dc6b27b45 100644 --- a/http-walker.c +++ b/http-walker.c @@ -442,6 +442,8 @@ static int setup_index(struct walker *walker, struct alt_base *repo, unsigned ch 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; |