streaming: make sure to notice corrupt object
The streaming read interface from a loose object called parse_sha1_header() but discarded its return value, without noticing a potential error. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 26, 2016 at 09:23 UTC
97026fe9a6f70b6c0a9e09408a504287c13dea43
1 file changed
+6
-6
streaming.c
+6
-6
@@ -337,17 +337,17 @@ static open_method_decl(loose)
337
st->u.loose.mapped = map_sha1_file(sha1, &st->u.loose.mapsize);
338
if (!st->u.loose.mapped)
339
return -1;
340
- if (unpack_sha1_header(&st->z,
341
- st->u.loose.mapped,
342
- st->u.loose.mapsize,
343
- st->u.loose.hdr,
344
- sizeof(st->u.loose.hdr)) < 0) {
340
+ if ((unpack_sha1_header(&st->z,
341
+ st->u.loose.mapped,
342
+ st->u.loose.mapsize,
343
+ st->u.loose.hdr,
344
+ sizeof(st->u.loose.hdr)) < 0) ||
345
+ (parse_sha1_header(st->u.loose.hdr, &st->size) < 0)) {
346
git_inflate_end(&st->z);
347
munmap(st->u.loose.mapped, st->u.loose.mapsize);
348
return -1;
349
}
350
350
- parse_sha1_header(st->u.loose.hdr, &st->size);
351
st->u.loose.hdr_used = strlen(st->u.loose.hdr) + 1;
352
st->u.loose.hdr_avail = st->z.total_out;
353
st->z_state = z_used;