mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Have std/json emit pending strings on bad UTF-8
Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=20973
This commit is contained in:
1 parent
107f0ef2e5
commit
4ee19eb807
2 files changed
+51
No files matched your search
@@ -19637,6 +19637,15 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
|
||||
goto exit;
|
||||
} else if (v_char == 3) {
|
||||
if (((uint64_t)(io2_a_src - iop_a_src)) < 2) {
|
||||
if (v_string_length > 0) {
|
||||
*iop_a_dst++ = wuffs_base__make_token(
|
||||
(((uint64_t)(4194337))
|
||||
<< WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
|
||||
(((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) |
|
||||
(((uint64_t)(v_string_length))
|
||||
<< 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_utf_8);
|
||||
@@ -19670,6 +19679,15 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
|
||||
}
|
||||
} else if (v_char == 4) {
|
||||
if (((uint64_t)(io2_a_src - iop_a_src)) < 3) {
|
||||
if (v_string_length > 0) {
|
||||
*iop_a_dst++ = wuffs_base__make_token(
|
||||
(((uint64_t)(4194337))
|
||||
<< WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
|
||||
(((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) |
|
||||
(((uint64_t)(v_string_length))
|
||||
<< 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_utf_8);
|
||||
@@ -19708,6 +19726,15 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
|
||||
}
|
||||
} else if (v_char == 5) {
|
||||
if (((uint64_t)(io2_a_src - iop_a_src)) < 4) {
|
||||
if (v_string_length > 0) {
|
||||
*iop_a_dst++ = wuffs_base__make_token(
|
||||
(((uint64_t)(4194337))
|
||||
<< WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
|
||||
(((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) |
|
||||
(((uint64_t)(v_string_length))
|
||||
<< 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_utf_8);
|
||||
|
||||
@@ -384,6 +384,14 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
|
||||
} else if char == 0x03 { // 2-byte UTF-8.
|
||||
if args.src.available() < 2 {
|
||||
if string_length > 0 {
|
||||
args.dst.write_fast_token!(
|
||||
value_major: 0,
|
||||
value_minor: 0x40_0021,
|
||||
link: 0x3,
|
||||
length: string_length)
|
||||
string_length = 0
|
||||
}
|
||||
if args.src.is_closed() {
|
||||
return "#bad UTF-8"
|
||||
}
|
||||
@@ -412,6 +420,14 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
|
||||
} else if char == 0x04 { // 3-byte UTF-8.
|
||||
if args.src.available() < 3 {
|
||||
if string_length > 0 {
|
||||
args.dst.write_fast_token!(
|
||||
value_major: 0,
|
||||
value_minor: 0x40_0021,
|
||||
link: 0x3,
|
||||
length: string_length)
|
||||
string_length = 0
|
||||
}
|
||||
if args.src.is_closed() {
|
||||
return "#bad UTF-8"
|
||||
}
|
||||
@@ -445,6 +461,14 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
|
||||
|
||||
} else if char == 0x05 { // 4-byte UTF-8.
|
||||
if args.src.available() < 4 {
|
||||
if string_length > 0 {
|
||||
args.dst.write_fast_token!(
|
||||
value_major: 0,
|
||||
value_minor: 0x40_0021,
|
||||
link: 0x3,
|
||||
length: string_length)
|
||||
string_length = 0
|
||||
}
|
||||
if args.src.is_closed() {
|
||||
return "#bad UTF-8"
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user