From 38a231edfb655de9b6f22544bb5085b3be7e98e0 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 13 Oct 2017 11:56:51 +1100 Subject: [PATCH] Make a writer1's limited-length be 0 if closed. --- cmd/puffs-c/internal/cgen/var.go | 11 +++--- gen/c/std/flate.c | 60 +++++++++++++++++++------------- gen/c/std/gif.c | 15 ++++---- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/var.go b/cmd/puffs-c/internal/cgen/var.go index 8aba8e6c..2142f925 100644 --- a/cmd/puffs-c/internal/cgen/var.go +++ b/cmd/puffs-c/internal/cgen/var.go @@ -98,8 +98,7 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header if header { b.printf("%srstart_%s = %srptr_%s;", bPrefix, nameStr, bPrefix, nameStr) } - b.printf("size_t len = %s%s.buf->wi - %s%s.buf->ri;", - aPrefix, nameStr, aPrefix, nameStr) + b.printf("size_t len = %s%s.buf->wi - %s%s.buf->ri;", aPrefix, nameStr, aPrefix, nameStr) b.printf("puffs_base_limit1* lim;") b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr) b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }") @@ -121,13 +120,15 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header if header { b.printf("%swstart_%s = %swptr_%s;", bPrefix, nameStr, bPrefix, nameStr) } - b.printf("size_t len = %s%s.buf->len - %s%s.buf->wi;", - aPrefix, nameStr, aPrefix, nameStr) + b.printf("%swend_%s = %swptr_%s;", bPrefix, nameStr, bPrefix, nameStr) + b.printf("if (!%s%s.buf->closed) {", aPrefix, nameStr) + b.printf("size_t len = %s%s.buf->len - %s%s.buf->wi;", aPrefix, nameStr, aPrefix, nameStr) b.printf("puffs_base_limit1* lim;") b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr) b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }") b.printf("}") - b.printf("%swend_%s = %swptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr) + b.printf("%swend_%s += len;", bPrefix, nameStr) + b.printf("}\n") b.printf("}\n") } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 756c02e2..94147fe2 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -730,14 +730,17 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; b_wstart_dst = b_wptr_dst; - size_t len = a_dst.buf->len - a_dst.buf->wi; - puffs_base_limit1* lim; - for (lim = &a_dst.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; + b_wend_dst = b_wptr_dst; + if (!a_dst.buf->closed) { + size_t len = a_dst.buf->len - a_dst.buf->wi; + puffs_base_limit1* lim; + for (lim = &a_dst.limit; lim; lim = lim->next) { + if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { + len = *lim->ptr_to_len; + } } + b_wend_dst += len; } - b_wend_dst = b_wptr_dst + len; } uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; @@ -766,14 +769,17 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, puffs_flate_decoder_decode_blocks(self, a_dst, a_src); if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; - size_t len = a_dst.buf->len - a_dst.buf->wi; - puffs_base_limit1* lim; - for (lim = &a_dst.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; + b_wend_dst = b_wptr_dst; + if (!a_dst.buf->closed) { + size_t len = a_dst.buf->len - a_dst.buf->wi; + puffs_base_limit1* lim; + for (lim = &a_dst.limit; lim; lim = lim->next) { + if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { + len = *lim->ptr_to_len; + } } + b_wend_dst += len; } - b_wend_dst = b_wptr_dst + len; } v_z = t_0; if (!(v_z > 0)) { @@ -1046,14 +1052,17 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; b_wstart_dst = b_wptr_dst; - size_t len = a_dst.buf->len - a_dst.buf->wi; - puffs_base_limit1* lim; - for (lim = &a_dst.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; + b_wend_dst = b_wptr_dst; + if (!a_dst.buf->closed) { + size_t len = a_dst.buf->len - a_dst.buf->wi; + puffs_base_limit1* lim; + for (lim = &a_dst.limit; lim; lim = lim->next) { + if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { + 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 = NULL; @@ -1215,14 +1224,17 @@ puffs_flate_status puffs_flate_decoder_decode_huffman( if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; b_wstart_dst = b_wptr_dst; - size_t len = a_dst.buf->len - a_dst.buf->wi; - puffs_base_limit1* lim; - for (lim = &a_dst.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; + b_wend_dst = b_wptr_dst; + if (!a_dst.buf->closed) { + size_t len = a_dst.buf->len - a_dst.buf->wi; + puffs_base_limit1* lim; + for (lim = &a_dst.limit; lim; lim = lim->next) { + if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { + 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 = NULL; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 957eb1e3..93160abd 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1325,14 +1325,17 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, if (a_dst.buf) { b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi; b_wstart_dst = b_wptr_dst; - size_t len = a_dst.buf->len - a_dst.buf->wi; - puffs_base_limit1* lim; - for (lim = &a_dst.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; + b_wend_dst = b_wptr_dst; + if (!a_dst.buf->closed) { + size_t len = a_dst.buf->len - a_dst.buf->wi; + puffs_base_limit1* lim; + for (lim = &a_dst.limit; lim; lim = lim->next) { + if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { + 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 = NULL;