From abe08bc6f6f194ef0a3bfb75163450795db6fc42 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 2 May 2018 20:19:50 +1000 Subject: [PATCH] Add wuffs_base__io_reader__is_eof --- cmd/wuffs-c/internal/cgen/base-impl.h | 5 +++++ cmd/wuffs-c/internal/cgen/data.go | 18 +++++++-------- cmd/wuffs-c/internal/cgen/templates.h | 3 +-- gen/c/std/adler32.c | 5 +++++ gen/c/std/crc32.c | 5 +++++ gen/c/std/deflate.c | 17 +++++++------- gen/c/std/gif.c | 32 ++++++++++++--------------- gen/c/std/gzip.c | 8 +++++-- gen/c/std/zlib.c | 8 +++++-- 9 files changed, 59 insertions(+), 42 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index c03066cb..a11e9978 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -237,6 +237,11 @@ static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { (buf.wi >= buf.ri); } +static inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) { + wuffs_base__io_buffer* buf = o.private_impl.buf; + return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]); +} + static inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) { wuffs_base__io_buffer* buf = o.private_impl.buf; // Note: if making this function public (i.e. moving it to base-header.h), it diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index aad8ebd7..10531ae6 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -92,13 +92,13 @@ const baseImpl = "" + "" + "// --------\n\nstatic inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) {\n *x = wuffs_base__u8__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) {\n *x = wuffs_base__u8__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) {\n *x = wuffs_base__u16__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) {\n *x = wuffs_base__u16__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) {\n *x = wuffs_base__u32__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) {\n *x = wuffs_base__u32__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) {\n *x = wuffs_base__u64__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) {\n *x = wuffs_base__u64__sat_sub(*x, y);\n}\n\n" + "" + - "// ---------------- I/O\n\nstatic inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) {\n return (buf.ptr || (buf.len == 0)) && (buf.len >= buf.wi) &&\n (buf.wi >= buf.ri);\n}\n\nstatic inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow NULL (i.e. implicit, callee-calculated) bounds.\n return buf ? ((buf->ptr <= o.private_impl.bounds[0]) &&\n (o.private_impl.bounds[0] <= o.private_impl.bounds[1]) &&\n (o.private_impl.bounds[1] <= buf->ptr + buf->len))\n : ((o.private_impl.bounds[0] == NULL) &&\n (o.private_impl.bounds[1] == NULL));\n}\n\nstatic inline bool wuffs_base__io_writer__is_valid(wuffs_base__io_writer o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow" + - " NULL (i.e. implicit, callee-calculated) bounds.\n return buf ? ((buf->ptr <= o.private_impl.bounds[0]) &&\n (o.private_impl.bounds[0] <= o.private_impl.bounds[1]) &&\n (o.private_impl.bounds[1] <= buf->ptr + buf->len))\n : ((o.private_impl.bounds[0] == NULL) &&\n (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 th" + - "e\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_history32 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 wuffs_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 - 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\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 uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;\n if " + - "(!o->private_impl.bounds[0]) {\n o->private_impl.bounds[0] = p;\n o->private_impl.bounds[1] = q;\n }\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 if (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_wr" + - "iter* 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 uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;\n if (!o->private_impl.bounds[0]) {\n o->private_impl.bounds[0] = p;\n o->private_impl.bounds[1] = q;\n }\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" + + "// ---------------- I/O\n\nstatic inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) {\n return (buf.ptr || (buf.len == 0)) && (buf.len >= buf.wi) &&\n (buf.wi >= buf.ri);\n}\n\nstatic inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]);\n}\n\nstatic inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow NULL (i.e. implicit, callee-calculated) bounds.\n return buf ? ((buf->ptr <= o.private_impl.bounds[0]) &&\n (o.private_impl.bounds[0] <= o.private_impl.bounds[1]) &&\n (o.private_impl.bounds[1] <= buf->ptr + buf->len))\n : ((o.private_impl.bounds[0] == NULL) &&\n (o.private_impl.bounds[1] == NULL));\n}\n\nstatic inline bool wuf" + + "fs_base__io_writer__is_valid(wuffs_base__io_writer o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow NULL (i.e. implicit, callee-calculated) bounds.\n return buf ? ((buf->ptr <= o.private_impl.bounds[0]) &&\n (o.private_impl.bounds[0] <= o.private_impl.bounds[1]) &&\n (o.private_impl.bounds[1] <= buf->ptr + buf->len))\n : ((o.private_impl.bounds[0] == NULL) &&\n (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_history32 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_pt" + + "r - 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 wuffs_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** p" + + "tr_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 - 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\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_r" + + "eader* 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 uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;\n if (!o->private_impl.bounds[0]) {\n o->private_impl.bounds[0] = p;\n o->private_impl.bounds[1] = q;\n }\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 if (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 uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;\n if (!o->private_impl.bounds[0]) {\n o->private_impl.bounds[0] = p;\n o->private_impl.bounds[1] = q;\n }\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 { @@ -107,9 +107,7 @@ type template_args_short_read struct { } func template_short_read(b *buffer, args template_args_short_read) error { - b.printf("short_read_%s:\nif (a_%s.private_impl.buf && a_%s.private_impl.buf->closed &&\n!a_%s.private_impl.limit.ptr_to_len) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = %sSUSPENSION_SHORT_READ;\ngoto suspend;\n", - args.name, - args.name, + b.printf("short_read_%s:\nif (wuffs_base__io_reader__is_eof(a_%s)) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = %sSUSPENSION_SHORT_READ;\ngoto suspend;\n", args.name, args.name, args.PKGPREFIX, diff --git a/cmd/wuffs-c/internal/cgen/templates.h b/cmd/wuffs-c/internal/cgen/templates.h index 1330206d..f03a13b8 100644 --- a/cmd/wuffs-c/internal/cgen/templates.h +++ b/cmd/wuffs-c/internal/cgen/templates.h @@ -23,8 +23,7 @@ template short_read(string qPKGPREFIXq, string qnameq) { short_read_qnameq: - if (a_qnameq.private_impl.buf && a_qnameq.private_impl.buf->closed && - !a_qnameq.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_qnameq)) { status = qPKGPREFIXqERROR_UNEXPECTED_EOF; goto exit; } diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 00461f30..09a37307 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1362,6 +1362,11 @@ static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { (buf.wi >= buf.ri); } +static inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) { + wuffs_base__io_buffer* buf = o.private_impl.buf; + return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]); +} + static inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) { wuffs_base__io_buffer* buf = o.private_impl.buf; // Note: if making this function public (i.e. moving it to base-header.h), it diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 73def338..a2a0bb23 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1361,6 +1361,11 @@ static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { (buf.wi >= buf.ri); } +static inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) { + wuffs_base__io_buffer* buf = o.private_impl.buf; + return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]); +} + static inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) { wuffs_base__io_buffer* buf = o.private_impl.buf; // Note: if making this function public (i.e. moving it to base-header.h), it diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 52c497a1..b232c538 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1453,6 +1453,11 @@ static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { (buf.wi >= buf.ri); } +static inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) { + wuffs_base__io_buffer* buf = o.private_impl.buf; + return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]); +} + static inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) { wuffs_base__io_buffer* buf = o.private_impl.buf; // Note: if making this function public (i.e. moving it to base-header.h), it @@ -2134,8 +2139,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF; goto exit; } @@ -2287,8 +2291,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF; goto exit; } @@ -2615,8 +2618,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF; goto exit; } @@ -3685,8 +3687,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF; goto exit; } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 47686020..25aab55a 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1469,6 +1469,11 @@ static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { (buf.wi >= buf.ri); } +static inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) { + wuffs_base__io_buffer* buf = o.private_impl.buf; + return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]); +} + static inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) { wuffs_base__io_buffer* buf = o.private_impl.buf; // Note: if making this function public (i.e. moving it to base-header.h), it @@ -1963,8 +1968,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GIF__ERROR_UNEXPECTED_EOF; goto exit; } @@ -2095,8 +2099,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GIF__ERROR_UNEXPECTED_EOF; goto exit; } @@ -2182,8 +2185,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GIF__ERROR_UNEXPECTED_EOF; goto exit; } @@ -2303,8 +2305,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GIF__ERROR_UNEXPECTED_EOF; goto exit; } @@ -2408,8 +2409,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GIF__ERROR_UNEXPECTED_EOF; goto exit; } @@ -2498,8 +2498,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GIF__ERROR_UNEXPECTED_EOF; goto exit; } @@ -2714,8 +2713,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GIF__ERROR_UNEXPECTED_EOF; goto exit; } @@ -3026,8 +3024,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GIF__ERROR_UNEXPECTED_EOF; goto exit; } @@ -3250,8 +3247,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GIF__ERROR_UNEXPECTED_EOF; goto exit; } diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 3de646bb..18148244 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1657,6 +1657,11 @@ static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { (buf.wi >= buf.ri); } +static inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) { + wuffs_base__io_buffer* buf = o.private_impl.buf; + return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]); +} + static inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) { wuffs_base__io_buffer* buf = o.private_impl.buf; // Note: if making this function public (i.e. moving it to base-header.h), it @@ -2330,8 +2335,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_GZIP__ERROR_UNEXPECTED_EOF; goto exit; } diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 8b5bed0c..c8514e8c 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1657,6 +1657,11 @@ static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { (buf.wi >= buf.ri); } +static inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) { + wuffs_base__io_buffer* buf = o.private_impl.buf; + return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]); +} + static inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) { wuffs_base__io_buffer* buf = o.private_impl.buf; // Note: if making this function public (i.e. moving it to base-header.h), it @@ -2192,8 +2197,7 @@ exit: return status; short_read_src: - if (a_src.private_impl.buf && a_src.private_impl.buf->closed && - !a_src.private_impl.limit.ptr_to_len) { + if (wuffs_base__io_reader__is_eof(a_src)) { status = WUFFS_ZLIB__ERROR_UNEXPECTED_EOF; goto exit; }