mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 08:47:28 +01:00
Fix std/cbor src.meta.ri for too much recursion
Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25145
This commit is contained in:
1 parent
75682548f5
commit
75e1efcc4a
2 files changed
+20
No files matched your search
@@ -17145,6 +17145,11 @@ wuffs_cbor__decoder__decode_tokens(
|
|||||||
if (WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor] == 0) {
|
if (WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor] == 0) {
|
||||||
goto label__goto_fail__break;
|
goto label__goto_fail__break;
|
||||||
} else if (v_depth >= 1024) {
|
} else if (v_depth >= 1024) {
|
||||||
|
v_token_length = ((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor]));
|
||||||
|
while ((v_token_length > 0) && (iop_a_src > io1_a_src)) {
|
||||||
|
(iop_a_src--, wuffs_base__make_empty_struct());
|
||||||
|
v_token_length -= 1;
|
||||||
|
}
|
||||||
status = wuffs_base__make_status(wuffs_cbor__error__unsupported_recursion_depth);
|
status = wuffs_base__make_status(wuffs_cbor__error__unsupported_recursion_depth);
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
@@ -17181,6 +17186,11 @@ wuffs_cbor__decoder__decode_tokens(
|
|||||||
if (WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor] == 0) {
|
if (WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor] == 0) {
|
||||||
goto label__goto_fail__break;
|
goto label__goto_fail__break;
|
||||||
} else if (v_depth >= 1024) {
|
} else if (v_depth >= 1024) {
|
||||||
|
v_token_length = ((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor]));
|
||||||
|
while ((v_token_length > 0) && (iop_a_src > io1_a_src)) {
|
||||||
|
(iop_a_src--, wuffs_base__make_empty_struct());
|
||||||
|
v_token_length -= 1;
|
||||||
|
}
|
||||||
status = wuffs_base__make_status(wuffs_cbor__error__unsupported_recursion_depth);
|
status = wuffs_base__make_status(wuffs_cbor__error__unsupported_recursion_depth);
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -456,6 +456,11 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor
|
|||||||
if TOKEN_LENGTHS[c_minor] == 0 {
|
if TOKEN_LENGTHS[c_minor] == 0 {
|
||||||
break.goto_fail
|
break.goto_fail
|
||||||
} else if depth >= 1024 {
|
} else if depth >= 1024 {
|
||||||
|
token_length = TOKEN_LENGTHS[c_minor] as base.u32
|
||||||
|
while (token_length > 0) and (args.src.can_undo_byte()) {
|
||||||
|
args.src.undo_byte!()
|
||||||
|
token_length -= 1
|
||||||
|
} endwhile
|
||||||
return "#unsupported recursion depth"
|
return "#unsupported recursion depth"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -518,6 +523,11 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor
|
|||||||
if TOKEN_LENGTHS[c_minor] == 0 {
|
if TOKEN_LENGTHS[c_minor] == 0 {
|
||||||
break.goto_fail
|
break.goto_fail
|
||||||
} else if depth >= 1024 {
|
} else if depth >= 1024 {
|
||||||
|
token_length = TOKEN_LENGTHS[c_minor] as base.u32
|
||||||
|
while (token_length > 0) and (args.src.can_undo_byte()) {
|
||||||
|
args.src.undo_byte!()
|
||||||
|
token_length -= 1
|
||||||
|
} endwhile
|
||||||
return "#unsupported recursion depth"
|
return "#unsupported recursion depth"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user