summaryrefslogtreecommitdiff
path: root/streaming.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-03 20:30:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-03 20:30:36 (GMT)
commit71a57ab32d211be19729c3afaf0a7c7283c7a4e2 (patch)
tree0e251211fd9fd99e0f7ab724084791db632608b7 /streaming.c
parent53eb85e6230e2c09dbc06f88b67e7a3baccc4446 (diff)
parentd21f8426907e84465ab54df5b05bc81057f448d9 (diff)
downloadgit-71a57ab32d211be19729c3afaf0a7c7283c7a4e2.zip
git-71a57ab32d211be19729c3afaf0a7c7283c7a4e2.tar.gz
git-71a57ab32d211be19729c3afaf0a7c7283c7a4e2.tar.bz2
Merge branch 'jc/verify-loose-object-header'
Codepaths that read from an on-disk loose object were too loose in validating what they are reading is a proper object file and sometimes read past the data they read from the disk, which has been corrected. H/t to Gustavo Grieco for reporting. * jc/verify-loose-object-header: unpack_sha1_header(): detect malformed object header streaming: make sure to notice corrupt object
Diffstat (limited to 'streaming.c')
-rw-r--r--streaming.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/streaming.c b/streaming.c
index 3c48f04..3f017a1 100644
--- a/streaming.c
+++ b/streaming.c
@@ -337,17 +337,17 @@ static open_method_decl(loose)
st->u.loose.mapped = map_sha1_file(sha1, &st->u.loose.mapsize);
if (!st->u.loose.mapped)
return -1;
- if (unpack_sha1_header(&st->z,
- st->u.loose.mapped,
- st->u.loose.mapsize,
- st->u.loose.hdr,
- sizeof(st->u.loose.hdr)) < 0) {
+ if ((unpack_sha1_header(&st->z,
+ st->u.loose.mapped,
+ st->u.loose.mapsize,
+ st->u.loose.hdr,
+ sizeof(st->u.loose.hdr)) < 0) ||
+ (parse_sha1_header(st->u.loose.hdr, &st->size) < 0)) {
git_inflate_end(&st->z);
munmap(st->u.loose.mapped, st->u.loose.mapsize);
return -1;
}
- parse_sha1_header(st->u.loose.hdr, &st->size);
st->u.loose.hdr_used = strlen(st->u.loose.hdr) + 1;
st->u.loose.hdr_avail = st->z.total_out;
st->z_state = z_used;