diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index 496fb975..5dcf10bb 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -125,6 +125,10 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header b.printf("}\n") b.printf("}\n") + // TODO: remove this temporary consistency check. + b.printf("if (%srend_%s != %srptr_%s + len) { status = 101; self->private_impl.status = status; return status; }", + bPrefix, nameStr, bPrefix, nameStr) + b.printf("%srend_%s = %srptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr) } @@ -166,6 +170,10 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header b.printf("}\n") b.printf("}\n") + // TODO: remove this temporary consistency check. + b.printf("if (%swend_%s != %swptr_%s + len) { status = 102; self->private_impl.status = status; return status; }", + bPrefix, nameStr, 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 708faf0e..f3d860ed 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1881,6 +1881,11 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( len = *lim->ptr_to_len; } } + if (b_wend_dst != b_wptr_dst + len) { + status = 102; + self->private_impl.status = status; + return status; + } b_wend_dst = b_wptr_dst + len; } } @@ -2030,6 +2035,11 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -2238,6 +2248,11 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed( len = *lim->ptr_to_len; } } + if (b_wend_dst != b_wptr_dst + len) { + status = 102; + self->private_impl.status = status; + return status; + } b_wend_dst = b_wptr_dst + len; } } @@ -2260,6 +2275,11 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -2491,6 +2511,11 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_dynamic_huffman( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -3057,6 +3082,11 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_fast( len = *lim->ptr_to_len; } } + if (b_wend_dst != b_wptr_dst + len) { + status = 102; + self->private_impl.status = status; + return status; + } b_wend_dst = b_wptr_dst + len; } } @@ -3079,6 +3109,11 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_fast( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -3442,6 +3477,11 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( len = *lim->ptr_to_len; } } + if (b_wend_dst != b_wptr_dst + len) { + status = 102; + self->private_impl.status = status; + return status; + } b_wend_dst = b_wptr_dst + len; } } @@ -3464,6 +3504,11 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index f65504ba..804c0fff 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1872,6 +1872,11 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -2040,6 +2045,11 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -2191,6 +2201,11 @@ static wuffs_gif__status wuffs_gif__decoder__decode_header( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -2293,6 +2308,11 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -2426,6 +2446,11 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -2557,6 +2582,11 @@ static wuffs_gif__status wuffs_gif__decoder__skip_blocks( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -2664,6 +2694,11 @@ static wuffs_gif__status wuffs_gif__decoder__decode_ae( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -2904,6 +2939,11 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } @@ -3253,6 +3293,11 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( len = *lim->ptr_to_len; } } + if (b_wend_dst != b_wptr_dst + len) { + status = 102; + self->private_impl.status = status; + return status; + } b_wend_dst = b_wptr_dst + len; } } @@ -3275,6 +3320,11 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 66d82f7f..a15239bd 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -2026,6 +2026,11 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, len = *lim->ptr_to_len; } } + if (b_wend_dst != b_wptr_dst + len) { + status = 102; + self->private_impl.status = status; + return status; + } b_wend_dst = b_wptr_dst + len; } } @@ -2048,6 +2053,11 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; } diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 8b9d6a9c..144b0263 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -2022,6 +2022,11 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, len = *lim->ptr_to_len; } } + if (b_wend_dst != b_wptr_dst + len) { + status = 102; + self->private_impl.status = status; + return status; + } b_wend_dst = b_wptr_dst + len; } } @@ -2044,6 +2049,11 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, len = *lim->ptr_to_len; } } + if (b_rend_src != b_rptr_src + len) { + status = 101; + self->private_impl.status = status; + return status; + } b_rend_src = b_rptr_src + len; }