diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-08-25 01:26:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-25 08:33:47 -0700 |
| commit | 2e3404c3245e1e0031ef0a6574f25e8c35d5aac3 (patch) | |
| tree | e8ae7c29b6bb908dc8d61f991e313451f89a077a | |
| parent | ab43e495dd095547c3ada9ae13b72f9741a7f0d2 (diff) | |
| download | git-2e3404c3245e1e0031ef0a6574f25e8c35d5aac3.tar.gz git-2e3404c3245e1e0031ef0a6574f25e8c35d5aac3.tar.xz | |
pack-objects: check return value from read_sha1_file()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-pack-objects.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 77481df5d..9b3ef94c4 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1356,6 +1356,9 @@ static int try_delta(struct unpacked *trg, struct unpacked *src, /* Load data if not already done */ if (!trg->data) { trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz); + if (!trg->data) + die("object %s cannot be read", + sha1_to_hex(trg_entry->idx.sha1)); if (sz != trg_size) die("object %s inconsistent object length (%lu vs %lu)", sha1_to_hex(trg_entry->idx.sha1), sz, trg_size); @@ -1363,6 +1366,9 @@ static int try_delta(struct unpacked *trg, struct unpacked *src, } if (!src->data) { src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz); + if (!src->data) + die("object %s cannot be read", + sha1_to_hex(src_entry->idx.sha1)); if (sz != src_size) die("object %s inconsistent object length (%lu vs %lu)", sha1_to_hex(src_entry->idx.sha1), sz, src_size); |