From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Oct 2016 21:21:35 +0000 (-0700)
Subject: Merge branch 'jk/verify-packfile-gently' into maint
X-Git-Tag: v2.10.2~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6823506f364cd02589dd4485108516bd6bea8d9e?hp=fdb70b16a006f82b65fb92995886a074c829f587

Merge branch 'jk/verify-packfile-gently' into maint

A low-level function verify_packfile() was meant to show errors
that were detected without dying itself, but under some conditions
it didn't and died instead, which has been fixed.

* jk/verify-packfile-gently:
verify_packfile: check pack validity before accessing data
---

diff --git a/pack-check.c b/pack-check.c
index d123846ea2..c5c7763323 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -57,11 +57,8 @@ static int verify_packfile(struct packed_git *p,
 	int err = 0;
 	struct idx_entry *entries;
 
-	/* Note that the pack header checks are actually performed by
-	 * use_pack when it first opens the pack file.  If anything
-	 * goes wrong during those checks then the call will die out
-	 * immediately.
-	 */
+	if (!is_pack_valid(p))
+		return error("packfile %s cannot be accessed", p->pack_name);
 
 	git_SHA1_Init(&ctx);
 	do {