Mirrors/libyaml-safer
2
0
Fork 0
mirror of https://github.com/simonask/libyaml-safer synced 2025-02-17 04:48:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Factor out STACK_LIMIT macro

Browse source
This commit is contained in:
David Tolnay 2022-07-22 17:11:08 -07:00
parent 929613027b
commit 8d296adca8
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 15 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/loader.rs
View file

@ -275,17 +275,7 @@ unsafe fn yaml_parser_load_node_add(
let current_block_17: u64;
match (*parent).type_ as libc::c_uint {
2 => {
if if (((*parent).data.sequence.items.top)
.c_offset_from((*parent).data.sequence.items.start)
as libc::c_long)
< (2147483647_i32 - 1_i32) as libc::c_long
{
1_i32
} else {
(*parser).error = YAML_MEMORY_ERROR;
0_i32
} == 0
{
if STACK_LIMIT!(parser, (*parent).data.sequence.items) == 0 {
return 0_i32;
}
if PUSH!(parser, (*parent).data.sequence.items, index) == 0 {
@ -312,17 +302,7 @@ unsafe fn yaml_parser_load_node_add(
_ => {
(*pair).key = index;
(*pair).value = 0_i32;
if if (((*parent).data.mapping.pairs.top)
.c_offset_from((*parent).data.mapping.pairs.start)
as libc::c_long)
< (2147483647_i32 - 1_i32) as libc::c_long
{
1_i32
} else {
(*parser).error = YAML_MEMORY_ERROR;
0_i32
} == 0
{
if STACK_LIMIT!(parser, (*parent).data.mapping.pairs) == 0 {
return 0_i32;
}
if PUSH!(parser, (*parent).data.mapping.pairs, *pair) == 0 {
@ -375,16 +355,7 @@ unsafe fn yaml_parser_load_scalar(
let node = node.as_mut_ptr();
let index: libc::c_int;
let mut tag: *mut yaml_char_t = (*event).data.scalar.tag;
if !(if (((*(*parser).document).nodes.top).c_offset_from((*(*parser).document).nodes.start)
as libc::c_long)
< (2147483647_i32 - 1_i32) as libc::c_long
{
1_i32
} else {
(*parser).error = YAML_MEMORY_ERROR;
0_i32
} == 0)
{
if !(STACK_LIMIT!(parser, (*(*parser).document).nodes) == 0) {
if tag.is_null()
|| strcmp(
tag as *mut libc::c_char,
@ -457,16 +428,7 @@ unsafe fn yaml_parser_load_sequence(
};
let index: libc::c_int;
let mut tag: *mut yaml_char_t = (*event).data.sequence_start.tag;
if !(if (((*(*parser).document).nodes.top).c_offset_from((*(*parser).document).nodes.start)
as libc::c_long)
< (2147483647_i32 - 1_i32) as libc::c_long
{
1_i32
} else {
(*parser).error = YAML_MEMORY_ERROR;
0_i32
} == 0)
{
if !(STACK_LIMIT!(parser, (*(*parser).document).nodes) == 0) {
if tag.is_null()
|| strcmp(
tag as *mut libc::c_char,
@ -517,15 +479,7 @@ unsafe fn yaml_parser_load_sequence(
if yaml_parser_load_node_add(parser, ctx, index) == 0 {
return 0_i32;
}
if if (((*ctx).top).c_offset_from((*ctx).start) as libc::c_long)
< (2147483647_i32 - 1_i32) as libc::c_long
{
1_i32
} else {
(*parser).error = YAML_MEMORY_ERROR;
0_i32
} == 0
{
if STACK_LIMIT!(parser, *ctx) == 0 {
return 0_i32;
}
if PUSH!(parser, *ctx, index) == 0 {
@ -580,16 +534,7 @@ unsafe fn yaml_parser_load_mapping(
};
let index: libc::c_int;
let mut tag: *mut yaml_char_t = (*event).data.mapping_start.tag;
if !(if (((*(*parser).document).nodes.top).c_offset_from((*(*parser).document).nodes.start)
as libc::c_long)
< (2147483647_i32 - 1_i32) as libc::c_long
{
1_i32
} else {
(*parser).error = YAML_MEMORY_ERROR;
0_i32
} == 0)
{
if !(STACK_LIMIT!(parser, (*(*parser).document).nodes) == 0) {
if tag.is_null()
|| strcmp(
tag as *mut libc::c_char,
@ -640,15 +585,7 @@ unsafe fn yaml_parser_load_mapping(
if yaml_parser_load_node_add(parser, ctx, index) == 0 {
return 0_i32;
}
if if (((*ctx).top).c_offset_from((*ctx).start) as libc::c_long)
< (2147483647_i32 - 1_i32) as libc::c_long
{
1_i32
} else {
(*parser).error = YAML_MEMORY_ERROR;
0_i32
} == 0
{
if STACK_LIMIT!(parser, *ctx) == 0 {
return 0_i32;
}
if PUSH!(parser, *ctx, index) == 0 {

9
src/macros.rs
View file

@ -424,7 +424,14 @@ macro_rules! STACK_EMPTY {
}
macro_rules! STACK_LIMIT {
() => {}; // TODO
($context:expr, $stack:expr) => {
if $stack.top.c_offset_from($stack.start) < libc::c_int::MAX as isize - 1 {
1_i32
} else {
(*$context).error = YAML_MEMORY_ERROR;
0_i32
}
};
}
macro_rules! PUSH {