mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Have std/json look at args.src.is_closed()
This commit is contained in:
1 parent
8850d38403
commit
67306567f9
3 files changed
+24
-5
No files matched your search
@@ -103,11 +103,8 @@ const char* read_src() {
|
||||
size_t n = fread(src.data.ptr + src.meta.wi, sizeof(uint8_t),
|
||||
src.data.len - src.meta.wi, stdin);
|
||||
src.meta.wi += n;
|
||||
if (n > 0) {
|
||||
// No-op.
|
||||
} else if (feof(stdin)) {
|
||||
src.meta.closed = true;
|
||||
} else {
|
||||
src.meta.closed = feof(stdin);
|
||||
if ((n == 0) && !src.meta.closed) {
|
||||
return "main: read error";
|
||||
}
|
||||
return nullptr;
|
||||
|
||||
@@ -18296,6 +18296,10 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
|
||||
<< WUFFS_BASE__TOKEN__LENGTH__SHIFT));
|
||||
v_whitespace_length = 0;
|
||||
}
|
||||
if (a_src && a_src->meta.closed) {
|
||||
status = wuffs_base__make_status(wuffs_json__error__bad_input);
|
||||
goto exit;
|
||||
}
|
||||
status = wuffs_base__make_status(wuffs_base__suspension__short_read);
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
|
||||
v_whitespace_length = 0;
|
||||
@@ -18364,6 +18368,11 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
|
||||
<< WUFFS_BASE__TOKEN__LENGTH__SHIFT));
|
||||
v_string_length = 0;
|
||||
}
|
||||
if (a_src && a_src->meta.closed) {
|
||||
status =
|
||||
wuffs_base__make_status(wuffs_json__error__bad_input);
|
||||
goto exit;
|
||||
}
|
||||
status =
|
||||
wuffs_base__make_status(wuffs_base__suspension__short_read);
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
|
||||
@@ -18471,6 +18480,10 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
|
||||
wuffs_json__error__unsupported_number_length);
|
||||
goto exit;
|
||||
}
|
||||
if (a_src && a_src->meta.closed) {
|
||||
status = wuffs_base__make_status(wuffs_json__error__bad_input);
|
||||
goto exit;
|
||||
}
|
||||
status =
|
||||
wuffs_base__make_status(wuffs_base__suspension__short_read);
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
|
||||
|
||||
@@ -103,6 +103,9 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
args.dst.write_fast_token!(value: 0, length: whitespace_length as base.u64)
|
||||
whitespace_length = 0
|
||||
}
|
||||
if args.src.is_closed() {
|
||||
return "#bad input"
|
||||
}
|
||||
yield? base."$short read"
|
||||
whitespace_length = 0
|
||||
continue.outer
|
||||
@@ -169,6 +172,9 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
args.dst.write_fast_token!(value: 0x60_0001, length: string_length as base.u64)
|
||||
string_length = 0
|
||||
}
|
||||
if args.src.is_closed() {
|
||||
return "#bad input"
|
||||
}
|
||||
yield? base."$short read"
|
||||
string_length = 0
|
||||
continue.string_loop
|
||||
@@ -260,6 +266,9 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
} else if number_length < 1 {
|
||||
return "#unsupported number length"
|
||||
}
|
||||
if args.src.is_closed() {
|
||||
return "#bad input"
|
||||
}
|
||||
yield? base."$short read"
|
||||
while args.dst.available() <= 0,
|
||||
post args.dst.available() > 0,
|
||||
|
||||
Reference in new issue
Block a user