Home » Mailing list archives » git » 2010 » October » 22

[PATCH] diff: don't presume empty file when corresponding object is missing

Previous thread: should Documentation/howto/setup-git-server-over-http.txt be marked obsolete? by Sitaram Chamarty on Thursday, October 21, 2010 - 8:48 pm. (8 messages)

Next thread: [PATCH] make pack-objects a bit more resilient to repo corruption by Nicolas Pitre on Thursday, October 21, 2010 - 9:53 pm. (11 messages)
[view original message]
From: Nicolas Pitre
Subject: [PATCH] diff: don't presume empty file when corresponding object is missing
Date: Thursday, October 21, 2010 - 9:02 pm

The low-level diff code will happily produce totally bogus diff output 
with a broken repository via format-patch and friends by treating missing
objects as empty files.  Let's prevent that from happening any longer.

Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
---

diff --git a/diff.c b/diff.c
index 4732b32..b2839f9 100644
--- a/diff.c
+++ b/diff.c
@@ -2386,10 +2386,14 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
 	}
 	else {
 		enum object_type type;
-		if (size_only)
+		if (size_only) {
 			type = sha1_object_info(s->sha1, &s->size);
-		else {
+			if (type < 0)
+				die("unable to read %s", sha1_to_hex(s->sha1));
+		} else {
 			s->data = read_sha1_file(s->sha1, &type, &s->size);
+			if (!s->data)
+				die("unable to read %s", sha1_to_hex(s->sha1));
 			s->should_free = 1;
 		}
 	}

[ message continues ]
[view original message]
From: Uwe Kleine-König
Subject: Re: [PATCH] diff: don't presume empty file when corresponding object is missing
Date: Friday, October 22, 2010 - 12:04 am

Hi Nicolas,

Great, this fixes format-patch to fail in my tree as advertised.

Thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--


[ message continues ]
Previous thread: should Documentation/howto/setup-git-server-over-http.txt be marked obsolete? by Sitaram Chamarty on Thursday, October 21, 2010 - 8:48 pm. (8 messages)

Next thread: [PATCH] make pack-objects a bit more resilient to repo corruption by Nicolas Pitre on Thursday, October 21, 2010 - 9:53 pm. (11 messages)