Have read_u8 honor the limit.

This commit is contained in:
Nigel Tao committed 2017-06-23 10:01:31 +10:00
1 parent 7a3ddbc025
commit 0088c7e257
4 files changed
+120 -44

No files matched your search

+9 -3
View File
@@ -988,9 +988,13 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.perFunc.tempW++
// TODO: suspend coroutine state.
g.printf("if (%ssrc.buf->ri >= %ssrc.buf->wi) {", aPrefix, aPrefix)
g.printf("status = %ssrc.buf->closed ? puffs_%s_error_unexpected_eof : puffs_%s_status_short_read;",
aPrefix, g.pkgName, g.pkgName)
//
// TODO: loop over all limits, not just the first one.
g.printf("if ((%ssrc.buf->ri >= %ssrc.buf->wi) || (%ssrc.limit.len && (*%ssrc.limit.len == 0))) {",
aPrefix, aPrefix, aPrefix, aPrefix)
g.printf("status = ((%ssrc.buf->closed) && (%ssrc.buf->ri == %ssrc.buf->wi)) ?"+
"puffs_%s_error_unexpected_eof : puffs_%s_status_short_read;",
aPrefix, aPrefix, aPrefix, g.pkgName, g.pkgName)
if g.perFunc.public && g.perFunc.suspendible {
g.writes("goto cleanup0;")
} else {
@@ -1003,6 +1007,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
return err
}
g.printf(" = %ssrc.buf->ptr[%ssrc.buf->ri++];\n", aPrefix, aPrefix)
g.printf("if (%ssrc.limit.len) { (*%ssrc.limit.len)--; }\n", aPrefix, aPrefix)
} else if isInSrc(g.tm, n, t.KeySkip32, 1) {
if g.perFunc.tempW > maxTemp {
@@ -1012,6 +1017,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.perFunc.tempW++
g.perFunc.tempR++
// TODO: loop over all limits.
g.printf("size_t %s%d = ", tPrefix, temp)
x := n.Args()[0].Arg().Value()
if err := g.writeExpr(x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
+96 -36
View File
@@ -337,12 +337,17 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
goto cleanup0;
}
while (true) {
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
goto cleanup0;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
v_c = t_0;
if (v_c == 33) {
status = puffs_gif_decoder_decode_extension(self, a_src);
@@ -380,12 +385,17 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
};
v_i = 0;
while (v_i < 6) {
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
v_c[v_i] = t_0;
v_i += 1;
}
@@ -410,12 +420,17 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
};
v_i = 0;
while (v_i < 7) {
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
v_c[v_i] = t_0;
v_i += 1;
}
@@ -428,26 +443,41 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
v_gct_size = (((uint32_t)(1)) << (1 + (v_c[4] & 7)));
v_i = 0;
while (v_i < v_gct_size) {
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
self->private_impl.f_gct[(3 * v_i) + 0] = t_1;
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
self->private_impl.f_gct[(3 * v_i) + 1] = t_2;
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_3 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
self->private_impl.f_gct[(3 * v_i) + 2] = t_3;
v_i += 1;
}
@@ -463,12 +493,17 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
uint8_t v_label;
uint8_t v_block_size;
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
v_label = t_0;
if (v_label == 1) {
} else if (v_label == 249) {
@@ -478,12 +513,17 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
return puffs_gif_error_bad_gif_extension_label;
}
while (true) {
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
v_block_size = t_1;
if (v_block_size == 0) {
goto label_0_break;
@@ -521,12 +561,17 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
};
v_i = 0;
while (v_i < 9) {
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
v_c[v_i] = t_0;
v_i += 1;
}
@@ -536,12 +581,17 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
if ((v_c[8] & 128) != 0) {
return puffs_gif_error_todo_unsupported_local_color_table;
}
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
v_lw = t_1;
if ((v_lw < 2) || (8 < v_lw)) {
return puffs_gif_error_bad_lzw_literal_width;
@@ -549,12 +599,17 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
puffs_gif_lzw_decoder_set_literal_width(&self->private_impl.f_lzw,
((uint32_t)(v_lw)));
while (true) {
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
v_block_size = t_2;
if (v_block_size == 0) {
goto label_0_break;
@@ -634,12 +689,17 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
label_0_continue:;
while (true) {
while (v_n_bits < v_width) {
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if ((a_src.buf->ri >= a_src.buf->wi) ||
(a_src.limit.len && (*a_src.limit.len == 0))) {
status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi))
? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
goto cleanup0;
}
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
if (a_src.limit.len) {
(*a_src.limit.len)--;
}
v_bits |= (((uint32_t)(t_0)) << v_n_bits);
v_n_bits += 8;
}
+12 -2
View File
@@ -242,6 +242,7 @@ cleanup0:;
void test_gif_decode_input_is_a_xxx(const char* filename,
const char* palette_filename,
const char* indexes_filename,
puffs_gif_status want) {
puffs_base_buf1 dst = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
puffs_base_buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
@@ -285,6 +286,14 @@ void test_gif_decode_input_is_a_xxx(const char* filename,
goto cleanup1;
}
puffs_base_buf1 ind_want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
if (!read_file(&ind_want, indexes_filename)) {
goto cleanup1;
}
if (!buf1s_equal("indexes ", &dst, &ind_want)) {
goto cleanup1;
}
cleanup1:
puffs_gif_decoder_destructor(&dec);
cleanup0:;
@@ -294,13 +303,14 @@ void test_gif_decode_input_is_a_gif() {
test_funcname = __func__;
test_gif_decode_input_is_a_xxx("../../testdata/bricks-dither.gif",
"../../testdata/bricks-dither.palette",
"../../testdata/bricks-dither.indexes",
// TODO: puffs_gif_status_ok);
puffs_gif_error_lzw_code_is_out_of_range);
puffs_gif_status_short_read);
}
void test_gif_decode_input_is_a_png() {
test_funcname = __func__;
test_gif_decode_input_is_a_xxx("../../testdata/bricks-dither.png", "",
test_gif_decode_input_is_a_xxx("../../testdata/bricks-dither.png", "", "",
puffs_gif_error_bad_gif_header);
}
+3 -3
View File
@@ -156,7 +156,7 @@ bool buf1s_equal(const char* prefix,
puffs_base_buf1* got,
puffs_base_buf1* want) {
if (!got || !want) {
FAIL("%sbufs1_equal: NULL argument", prefix);
FAIL("%sbuf1s_equal: NULL argument", prefix);
return false;
}
char* msg = fail_msg;
@@ -167,10 +167,10 @@ bool buf1s_equal(const char* prefix,
}
}
if (got->wi != want->wi) {
INCR_FAIL(msg, "%sbufs1_equal: wi: got %zu, want %zu.\n", prefix, got->wi,
INCR_FAIL(msg, "%sbuf1s_equal: wi: got %zu, want %zu.\n", prefix, got->wi,
want->wi);
} else if (i < got->wi) {
INCR_FAIL(msg, "%sbufs1_equal:\n", prefix);
INCR_FAIL(msg, "%sbuf1s_equal:\n", prefix);
} else {
return true;
}