From 00bd9adb7dc7498f745ba60a2587dc52344622ec Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 2 May 2018 16:26:41 +1000 Subject: [PATCH] Set implicit io_{reader,writer} bounds --- cmd/wuffs-c/internal/cgen/var.go | 33 +++++++-- gen/c/std/deflate.c | 123 ++++++++++++++++++++++++------- gen/c/std/gif.c | 116 +++++++++++++++++++++++------ gen/c/std/gzip.c | 28 +++++-- gen/c/std/zlib.c | 28 +++++-- 5 files changed, 262 insertions(+), 66 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index 2e3ae703..496fb975 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -97,8 +97,8 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header case t.QID{t.IDBase, t.IDIOReader}: if header { b.printf("uint8_t* %srptr_%s = NULL;", bPrefix, nameStr) - b.printf("uint8_t* %srstart_%s = %s%s.private_impl.bounds[0];", bPrefix, nameStr, aPrefix, nameStr) - b.printf("uint8_t* %srend_%s = %s%s.private_impl.bounds[1];", bPrefix, nameStr, aPrefix, nameStr) + b.printf("uint8_t* %srstart_%s = NULL;", bPrefix, nameStr) + b.printf("uint8_t* %srend_%s = NULL;", bPrefix, nameStr) } b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr) @@ -106,6 +106,15 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) if header { + b.printf("if (!%s%s.private_impl.bounds[0]) {", aPrefix, nameStr) + b.printf("%s%s.private_impl.bounds[0] = %srptr_%s;", aPrefix, nameStr, bPrefix, nameStr) + b.printf("%s%s.private_impl.bounds[1] = %s%s.private_impl.buf->ptr + %s%s.private_impl.buf->wi;", + aPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) + b.printf("}\n") + + b.printf("%srstart_%s = %s%s.private_impl.bounds[0];", bPrefix, nameStr, aPrefix, nameStr) + b.printf("%srend_%s = %s%s.private_impl.bounds[1];", bPrefix, nameStr, aPrefix, nameStr) + b.printf("uint64_t len = %s%s.private_impl.buf->wi - %s%s.private_impl.buf->ri;", aPrefix, nameStr, aPrefix, nameStr) @@ -124,8 +133,8 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header case t.QID{t.IDBase, t.IDIOWriter}: if header { b.printf("uint8_t* %swptr_%s = NULL;", bPrefix, nameStr) - b.printf("uint8_t* %swstart_%s = %s%s.private_impl.bounds[0];", bPrefix, nameStr, aPrefix, nameStr) - b.printf("uint8_t* %swend_%s = %s%s.private_impl.bounds[1];", bPrefix, nameStr, aPrefix, nameStr) + b.printf("uint8_t* %swstart_%s = NULL;", bPrefix, nameStr) + b.printf("uint8_t* %swend_%s = NULL;", bPrefix, nameStr) } b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr) @@ -133,7 +142,19 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) if header { - b.printf("%swend_%s = %swptr_%s;", bPrefix, nameStr, bPrefix, nameStr) + b.printf("if (!%s%s.private_impl.bounds[0]) {", aPrefix, nameStr) + b.printf("%s%s.private_impl.bounds[0] = %swptr_%s;", aPrefix, nameStr, bPrefix, nameStr) + b.printf("%s%s.private_impl.bounds[1] = %s%s.private_impl.buf->ptr + %s%s.private_impl.buf->len;", + aPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) + b.printf("}\n") + + b.printf("if (%s%s.private_impl.buf->closed) {", aPrefix, nameStr) + b.printf("%s%s.private_impl.bounds[1] = %swptr_%s;", aPrefix, nameStr, bPrefix, nameStr) + b.printf("}\n") + + b.printf("%swstart_%s = %s%s.private_impl.bounds[0];", bPrefix, nameStr, aPrefix, nameStr) + b.printf("%swend_%s = %s%s.private_impl.bounds[1];", bPrefix, nameStr, aPrefix, nameStr) + b.printf("if (!%s%s.private_impl.buf->closed) {", aPrefix, nameStr) b.printf("uint64_t len = %s%s.private_impl.buf->len - %s%s.private_impl.buf->wi;", aPrefix, nameStr, aPrefix, nameStr) @@ -145,7 +166,7 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header b.printf("}\n") b.printf("}\n") - b.printf("%swend_%s += len;", bPrefix, nameStr) + b.printf("%swend_%s = %swptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr) b.printf("}\n") } diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 1978392e..dc47a844 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1849,11 +1849,20 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( uint32_t v_already_full; uint8_t* b_wptr_dst = NULL; - uint8_t* b_wstart_dst = a_dst.private_impl.bounds[0]; - uint8_t* b_wend_dst = a_dst.private_impl.bounds[1]; + uint8_t* b_wstart_dst = NULL; + uint8_t* b_wend_dst = NULL; if (a_dst.private_impl.buf) { b_wptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; - b_wend_dst = b_wptr_dst; + if (!a_dst.private_impl.bounds[0]) { + a_dst.private_impl.bounds[0] = b_wptr_dst; + a_dst.private_impl.bounds[1] = + a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + } + if (a_dst.private_impl.buf->closed) { + a_dst.private_impl.bounds[1] = b_wptr_dst; + } + b_wstart_dst = a_dst.private_impl.bounds[0]; + b_wend_dst = a_dst.private_impl.bounds[1]; if (!a_dst.private_impl.buf->closed) { uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; wuffs_base__io_limit* lim; @@ -1862,7 +1871,7 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( len = *lim->ptr_to_len; } } - b_wend_dst += len; + b_wend_dst = b_wptr_dst + len; } } @@ -1993,10 +2002,17 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( uint32_t v_type; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2190,11 +2206,20 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed( uint32_t v_n_copied; uint8_t* b_wptr_dst = NULL; - uint8_t* b_wstart_dst = a_dst.private_impl.bounds[0]; - uint8_t* b_wend_dst = a_dst.private_impl.bounds[1]; + uint8_t* b_wstart_dst = NULL; + uint8_t* b_wend_dst = NULL; if (a_dst.private_impl.buf) { b_wptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; - b_wend_dst = b_wptr_dst; + if (!a_dst.private_impl.bounds[0]) { + a_dst.private_impl.bounds[0] = b_wptr_dst; + a_dst.private_impl.bounds[1] = + a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + } + if (a_dst.private_impl.buf->closed) { + a_dst.private_impl.bounds[1] = b_wptr_dst; + } + b_wstart_dst = a_dst.private_impl.bounds[0]; + b_wend_dst = a_dst.private_impl.bounds[1]; if (!a_dst.private_impl.buf->closed) { uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; wuffs_base__io_limit* lim; @@ -2203,14 +2228,21 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed( len = *lim->ptr_to_len; } } - b_wend_dst += len; + b_wend_dst = b_wptr_dst + len; } } uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2431,10 +2463,17 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_dynamic_huffman( uint32_t v_rep_count; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2986,11 +3025,20 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_fast( uint32_t v_hdist; uint8_t* b_wptr_dst = NULL; - uint8_t* b_wstart_dst = a_dst.private_impl.bounds[0]; - uint8_t* b_wend_dst = a_dst.private_impl.bounds[1]; + uint8_t* b_wstart_dst = NULL; + uint8_t* b_wend_dst = NULL; if (a_dst.private_impl.buf) { b_wptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; - b_wend_dst = b_wptr_dst; + if (!a_dst.private_impl.bounds[0]) { + a_dst.private_impl.bounds[0] = b_wptr_dst; + a_dst.private_impl.bounds[1] = + a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + } + if (a_dst.private_impl.buf->closed) { + a_dst.private_impl.bounds[1] = b_wptr_dst; + } + b_wstart_dst = a_dst.private_impl.bounds[0]; + b_wend_dst = a_dst.private_impl.bounds[1]; if (!a_dst.private_impl.buf->closed) { uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; wuffs_base__io_limit* lim; @@ -2999,14 +3047,21 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_fast( len = *lim->ptr_to_len; } } - b_wend_dst += len; + b_wend_dst = b_wptr_dst + len; } } uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -3355,11 +3410,20 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( uint32_t v_hdist; uint8_t* b_wptr_dst = NULL; - uint8_t* b_wstart_dst = a_dst.private_impl.bounds[0]; - uint8_t* b_wend_dst = a_dst.private_impl.bounds[1]; + uint8_t* b_wstart_dst = NULL; + uint8_t* b_wend_dst = NULL; if (a_dst.private_impl.buf) { b_wptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; - b_wend_dst = b_wptr_dst; + if (!a_dst.private_impl.bounds[0]) { + a_dst.private_impl.bounds[0] = b_wptr_dst; + a_dst.private_impl.bounds[1] = + a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + } + if (a_dst.private_impl.buf->closed) { + a_dst.private_impl.bounds[1] = b_wptr_dst; + } + b_wstart_dst = a_dst.private_impl.bounds[0]; + b_wend_dst = a_dst.private_impl.bounds[1]; if (!a_dst.private_impl.buf->closed) { uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; wuffs_base__io_limit* lim; @@ -3368,14 +3432,21 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( len = *lim->ptr_to_len; } } - b_wend_dst += len; + b_wend_dst = b_wptr_dst + len; } } uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index fa0fc95b..821fc547 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1844,10 +1844,17 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( wuffs_gif__status status = WUFFS_GIF__STATUS_OK; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2005,10 +2012,17 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame( wuffs_gif__status status = WUFFS_GIF__STATUS_OK; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2149,10 +2163,17 @@ static wuffs_gif__status wuffs_gif__decoder__decode_header( uint32_t v_i; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2244,10 +2265,17 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( uint32_t v_gct_size; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2370,10 +2398,17 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension( uint8_t v_label; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2494,10 +2529,17 @@ static wuffs_gif__status wuffs_gif__decoder__skip_blocks( uint8_t v_block_size; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2594,10 +2636,17 @@ static wuffs_gif__status wuffs_gif__decoder__decode_ae( bool v_not_netscape; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -2827,10 +2876,17 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( wuffs_gif__status v_z; uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { @@ -3165,11 +3221,20 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( uint64_t v_n_copied; uint8_t* b_wptr_dst = NULL; - uint8_t* b_wstart_dst = a_dst.private_impl.bounds[0]; - uint8_t* b_wend_dst = a_dst.private_impl.bounds[1]; + uint8_t* b_wstart_dst = NULL; + uint8_t* b_wend_dst = NULL; if (a_dst.private_impl.buf) { b_wptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; - b_wend_dst = b_wptr_dst; + if (!a_dst.private_impl.bounds[0]) { + a_dst.private_impl.bounds[0] = b_wptr_dst; + a_dst.private_impl.bounds[1] = + a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + } + if (a_dst.private_impl.buf->closed) { + a_dst.private_impl.bounds[1] = b_wptr_dst; + } + b_wstart_dst = a_dst.private_impl.bounds[0]; + b_wend_dst = a_dst.private_impl.bounds[1]; if (!a_dst.private_impl.buf->closed) { uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; wuffs_base__io_limit* lim; @@ -3178,14 +3243,21 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( len = *lim->ptr_to_len; } } - b_wend_dst += len; + b_wend_dst = b_wptr_dst + len; } } uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 81fad3cb..7eb96599 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1994,11 +1994,20 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, uint32_t v_decoded_length_want; uint8_t* b_wptr_dst = NULL; - uint8_t* b_wstart_dst = a_dst.private_impl.bounds[0]; - uint8_t* b_wend_dst = a_dst.private_impl.bounds[1]; + uint8_t* b_wstart_dst = NULL; + uint8_t* b_wend_dst = NULL; if (a_dst.private_impl.buf) { b_wptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; - b_wend_dst = b_wptr_dst; + if (!a_dst.private_impl.bounds[0]) { + a_dst.private_impl.bounds[0] = b_wptr_dst; + a_dst.private_impl.bounds[1] = + a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + } + if (a_dst.private_impl.buf->closed) { + a_dst.private_impl.bounds[1] = b_wptr_dst; + } + b_wstart_dst = a_dst.private_impl.bounds[0]; + b_wend_dst = a_dst.private_impl.bounds[1]; if (!a_dst.private_impl.buf->closed) { uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; wuffs_base__io_limit* lim; @@ -2007,14 +2016,21 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, len = *lim->ptr_to_len; } } - b_wend_dst += len; + b_wend_dst = b_wptr_dst + len; } } uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 042b688e..1ed723aa 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1990,11 +1990,20 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, uint32_t v_checksum_want; uint8_t* b_wptr_dst = NULL; - uint8_t* b_wstart_dst = a_dst.private_impl.bounds[0]; - uint8_t* b_wend_dst = a_dst.private_impl.bounds[1]; + uint8_t* b_wstart_dst = NULL; + uint8_t* b_wend_dst = NULL; if (a_dst.private_impl.buf) { b_wptr_dst = a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi; - b_wend_dst = b_wptr_dst; + if (!a_dst.private_impl.bounds[0]) { + a_dst.private_impl.bounds[0] = b_wptr_dst; + a_dst.private_impl.bounds[1] = + a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->len; + } + if (a_dst.private_impl.buf->closed) { + a_dst.private_impl.bounds[1] = b_wptr_dst; + } + b_wstart_dst = a_dst.private_impl.bounds[0]; + b_wend_dst = a_dst.private_impl.bounds[1]; if (!a_dst.private_impl.buf->closed) { uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; wuffs_base__io_limit* lim; @@ -2003,14 +2012,21 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, len = *lim->ptr_to_len; } } - b_wend_dst += len; + b_wend_dst = b_wptr_dst + len; } } uint8_t* b_rptr_src = NULL; - uint8_t* b_rstart_src = a_src.private_impl.bounds[0]; - uint8_t* b_rend_src = a_src.private_impl.bounds[1]; + uint8_t* b_rstart_src = NULL; + uint8_t* b_rend_src = NULL; if (a_src.private_impl.buf) { b_rptr_src = a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri; + if (!a_src.private_impl.bounds[0]) { + a_src.private_impl.bounds[0] = b_rptr_src; + a_src.private_impl.bounds[1] = + a_src.private_impl.buf->ptr + a_src.private_impl.buf->wi; + } + b_rstart_src = a_src.private_impl.bounds[0]; + b_rend_src = a_src.private_impl.bounds[1]; uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; wuffs_base__io_limit* lim; for (lim = &a_src.private_impl.limit; lim; lim = lim->next) {