From 0ad23714c68c31356367df20f8aaef6f8657b3d6 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 21 Feb 2018 16:14:19 +1100 Subject: [PATCH] Fix read_uxxbe across an I/O short read Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6473 --- cmd/wuffs-c/internal/cgen/statement.go | 3 ++- gen/c/std/zlib.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index a7699464..5e5de7c2 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -752,7 +752,8 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia b.printf("& 0xFF;") b.printf("%s >>= 8;", scratchName) b.printf("%s <<= 8;", scratchName) - b.printf("%s |= ((uint64_t)(*%srptr_%s++)) << (64 - %s%d);", + // TODO: make a test case for 56 (correct) vs 64 (incorrect). + b.printf("%s |= ((uint64_t)(*%srptr_%s++)) << (56 - %s%d);", scratchName, bPrefix, name, tPrefix, temp0) case "le": b.printf(">> 56;") diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 7fc35b54..837e41a1 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1035,7 +1035,7 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, self->private_impl.c_decode[0].scratch >>= 8; self->private_impl.c_decode[0].scratch <<= 8; self->private_impl.c_decode[0].scratch |= ((uint64_t)(*b_rptr_src++)) - << (64 - t_0); + << (56 - t_0); if (t_0 == 8) { t_1 = self->private_impl.c_decode[0].scratch >> (64 - 16); break; @@ -1130,7 +1130,7 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, self->private_impl.c_decode[0].scratch >>= 8; self->private_impl.c_decode[0].scratch <<= 8; self->private_impl.c_decode[0].scratch |= ((uint64_t)(*b_rptr_src++)) - << (64 - t_3); + << (56 - t_3); if (t_3 == 24) { t_4 = self->private_impl.c_decode[0].scratch >> (64 - 32); break;