From 8984662d36d13d4553992bb81384402d0a340ce6 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 2 May 2018 15:38:59 +1000 Subject: [PATCH] Fix set_limit when a_src and b_rptr_src diverge --- cmd/wuffs-c/internal/cgen/base-impl.h | 13 +++++++++++++ cmd/wuffs-c/internal/cgen/data.go | 4 ++-- cmd/wuffs-c/internal/cgen/expr.go | 5 +++-- gen/c/std/adler32.c | 13 +++++++++++++ gen/c/std/crc32.c | 13 +++++++++++++ gen/c/std/deflate.c | 13 +++++++++++++ gen/c/std/gif.c | 19 ++++++++++++++++++- gen/c/std/gzip.c | 13 +++++++++++++ gen/c/std/zlib.c | 13 +++++++++++++ 9 files changed, 101 insertions(+), 5 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index 308dc251..be50c9fc 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -405,6 +405,19 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct +wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, + uint64_t limit, + size_t ri_override) { + if (o && o->private_impl.buf) { + uint8_t* p = o->private_impl.buf->ptr + ri_override; + if ((o->private_impl.bounds[1] - p) > limit) { + o->private_impl.bounds[1] = p + limit; + } + } + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_reader__mark( wuffs_base__io_reader* o, uint8_t* mark) { diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index c0f20d8f..ca9bd5e0 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -96,8 +96,8 @@ const baseImpl = "" + " (o.private_impl.bounds[1] == NULL));\n}\n\nstatic inline uint32_t wuffs_base__io_writer__copy_from_history32(\n uint8_t** ptr_ptr,\n uint8_t* start,\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n if (!distance) {\n return 0;\n }\n uint8_t* ptr = *ptr_ptr;\n if ((size_t)(ptr - start) < (size_t)(distance)) {\n return 0;\n }\n start = ptr - distance;\n size_t n = end - ptr;\n if ((size_t)(length) > n) {\n length = n;\n } else {\n n = length;\n }\n // TODO: unrolling by 3 seems best for the std/deflate benchmarks, but that\n // is mostly because 3 is the minimum length for the deflate format. This\n // function implementation shouldn't overfit to that one format. Perhaps the\n // copy_from_history32 Wuffs method should also take an unroll hint argument,\n // and the cgen can look if that argument is the constant expression '3'.\n //\n // See also wuffs_base__io_writer__copy_from_history32__bco below.\n //\n // Alternatively, or additionally, have a sloppy_copy_from_history3" + "2 method\n // that copies 8 bytes at a time, possibly writing more than length bytes?\n for (; n >= 3; n -= 3) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\n// wuffs_base__io_writer__copy_from_history32__bco is a Bounds Check Optimized\n// version of the wuffs_base__io_writer__copy_from_history32 function above.\n// The caller needs to prove that:\n// - distance > 0\n// - distance <= (*ptr_ptr - start)\n// - length <= (end - *ptr_ptr)\nstatic inline uint32_t wuffs_base__io_writer__copy_from_history32__bco(\n uint8_t** ptr_ptr,\n uint8_t* start,\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n uint8_t* ptr = *ptr_ptr;\n start = ptr - distance;\n uint32_t n = length;\n for (; n >= 3; n -= 3) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\nstatic inline uint32_t wuff" + "s_base__io_writer__copy_from_reader32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n uint8_t** ptr_rptr,\n uint8_t* rend,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = length;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (n > rend - rptr) {\n n = rend - rptr;\n }\n if (n > 0) {\n memmove(wptr, rptr, n);\n *ptr_wptr += n;\n *ptr_rptr += n;\n }\n return n;\n}\n\nstatic inline uint64_t wuffs_base__io_writer__copy_from_slice(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n wuffs_base__slice_u8 src) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline uint32_t wuffs_base__io_writer__copy_from_slice32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n wuffs_base__slice_u8 src,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > wend - wp" + - "tr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\n// TODO: delete.\nstatic inline wuffs_base__io_reader wuffs_base__io_reader__limit(\n wuffs_base__io_reader* o,\n uint64_t* ptr_to_len) {\n wuffs_base__io_reader ret = *o;\n ret.private_impl.limit.ptr_to_len = ptr_to_len;\n ret.private_impl.limit.next = &o->private_impl.limit;\n return ret;\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit(\n wuffs_base__io_reader* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__mark(\n wuffs_base__io_reader* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_s" + - "truct wuffs_base__io_writer__set_limit(\n wuffs_base__io_writer* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__mark(\n wuffs_base__io_writer* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n" + + "tr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\n// TODO: delete.\nstatic inline wuffs_base__io_reader wuffs_base__io_reader__limit(\n wuffs_base__io_reader* o,\n uint64_t* ptr_to_len) {\n wuffs_base__io_reader ret = *o;\n ret.private_impl.limit.ptr_to_len = ptr_to_len;\n ret.private_impl.limit.next = &o->private_impl.limit;\n return ret;\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit(\n wuffs_base__io_reader* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,\n uint64_t limit,\n size_t ri_override) {\n i" + + "f (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + ri_override;\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__mark(\n wuffs_base__io_reader* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit(\n wuffs_base__io_writer* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__mark(\n wuffs_base__io_writer* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n" + "" type template_args_short_read struct { diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index d2b94b20..79ad5f19 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -162,11 +162,12 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare return fmt.Errorf(`TODO: cgen an "in.src.limit" expression`) } if isInSrc(g.tm, n, t.IDSetLimit, 1) { - b.printf("wuffs_base__io_reader__set_limit(&%ssrc,", aPrefix) + b.printf("wuffs_base__io_reader__set_limit_internal(&%ssrc,", aPrefix) if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil { return err } - b.writes(")") + // TODO: fix this set_limit_internal hack. + b.writes(", a_src.private_impl.buf ? (b_rptr_src - a_src.private_impl.buf->ptr) : 0)") // TODO: update the bPrefix variables? return nil } diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 3c942d0d..58e975c7 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1532,6 +1532,19 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct +wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, + uint64_t limit, + size_t ri_override) { + if (o && o->private_impl.buf) { + uint8_t* p = o->private_impl.buf->ptr + ri_override; + if ((o->private_impl.bounds[1] - p) > limit) { + o->private_impl.bounds[1] = p + limit; + } + } + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_reader__mark( wuffs_base__io_reader* o, uint8_t* mark) { diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index fef0a1b6..1d27ddad 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1531,6 +1531,19 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct +wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, + uint64_t limit, + size_t ri_override) { + if (o && o->private_impl.buf) { + uint8_t* p = o->private_impl.buf->ptr + ri_override; + if ((o->private_impl.bounds[1] - p) > limit) { + o->private_impl.bounds[1] = p + limit; + } + } + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_reader__mark( wuffs_base__io_reader* o, uint8_t* mark) { diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 455efc24..1b818662 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1623,6 +1623,19 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct +wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, + uint64_t limit, + size_t ri_override) { + if (o && o->private_impl.buf) { + uint8_t* p = o->private_impl.buf->ptr + ri_override; + if ((o->private_impl.bounds[1] - p) > limit) { + o->private_impl.bounds[1] = p + limit; + } + } + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_reader__mark( wuffs_base__io_reader* o, uint8_t* mark) { diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 9e98f302..338c5c26 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1639,6 +1639,19 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct +wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, + uint64_t limit, + size_t ri_override) { + if (o && o->private_impl.buf) { + uint8_t* p = o->private_impl.buf->ptr + ri_override; + if ((o->private_impl.bounds[1] - p) > limit) { + o->private_impl.bounds[1] = p + limit; + } + } + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_reader__mark( wuffs_base__io_reader* o, uint8_t* mark) { @@ -3008,7 +3021,11 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( { uint8_t* o_0_bounds0_src = a_src.private_impl.bounds[0]; uint8_t* o_0_bounds1_src = a_src.private_impl.bounds[1]; - wuffs_base__io_reader__set_limit(&a_src, v_block_size); + wuffs_base__io_reader__set_limit_internal( + &a_src, v_block_size, + a_src.private_impl.buf + ? (b_rptr_src - a_src.private_impl.buf->ptr) + : 0); v_r = a_src; { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15); diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index d86545de..289963b4 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1827,6 +1827,19 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct +wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, + uint64_t limit, + size_t ri_override) { + if (o && o->private_impl.buf) { + uint8_t* p = o->private_impl.buf->ptr + ri_override; + if ((o->private_impl.bounds[1] - p) > limit) { + o->private_impl.bounds[1] = p + limit; + } + } + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_reader__mark( wuffs_base__io_reader* o, uint8_t* mark) { diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 8ddea9a7..c4fb0c0a 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1827,6 +1827,19 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct +wuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o, + uint64_t limit, + size_t ri_override) { + if (o && o->private_impl.buf) { + uint8_t* p = o->private_impl.buf->ptr + ri_override; + if ((o->private_impl.bounds[1] - p) > limit) { + o->private_impl.bounds[1] = p + limit; + } + } + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_reader__mark( wuffs_base__io_reader* o, uint8_t* mark) {