Add a (temporary) limit consistency check

This commit is contained in:
Nigel Tao committed 2018-05-02 16:56:59 +10:00
1 parent 60a4e43635
commit 54d126db74
5 files changed
+123

No files matched your search

+8
View File
@@ -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")
}
+45
View File
@@ -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;
}
+50
View File
@@ -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;
}
+10
View File
@@ -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;
}
+10
View File
@@ -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;
}