From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Sep 2016 23:57:13 +0000 (-0700)
Subject: Merge branch 'jk/verify-packfile-gently'
X-Git-Tag: v2.11.0-rc0~101
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5c2c2d4aeed92ce047e889f415b513e1ee6ac3de?hp=4cff50b3fb50940e57dc10769b2f92d5cec1a05a

Merge branch 'jk/verify-packfile-gently'

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 {