From d655f51dae0bdc6ba61f60291efeff9c13d344d3 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 24 Dec 2020 22:34:25 +1100 Subject: [PATCH] Fix std/png decode_frame workbuf bounds checks --- release/c/wuffs-unsupported-snapshot.c | 2 +- std/png/decode_png.wuffs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 7202a7b2..d70eba54 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -30527,7 +30527,7 @@ wuffs_png__decoder__decode_frame( } self->private_impl.f_workbuf_wi = 0; while (true) { - if ((self->private_impl.f_workbuf_wi >= self->private_impl.f_workbuf_length) || (self->private_impl.f_workbuf_length >= ((uint64_t)(a_workbuf.len)))) { + if ((self->private_impl.f_workbuf_wi > self->private_impl.f_workbuf_length) || (self->private_impl.f_workbuf_length > ((uint64_t)(a_workbuf.len)))) { status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length); goto exit; } diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index 3e9fcb66..a40a7784 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -244,8 +244,8 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader, this.workbuf_wi = 0 while true { - if (this.workbuf_wi >= this.workbuf_length) or ( - this.workbuf_length >= args.workbuf.length()) { + if (this.workbuf_wi > this.workbuf_length) or ( + this.workbuf_length > args.workbuf.length()) { return base."#bad workbuf length" } io_bind (io: w, data: args.workbuf[this.workbuf_wi .. this.workbuf_length]) {