mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

x.json2: fix nest level check (#10584)

Browse Source
This commit is contained in:
Ned Palacios
2021-06-28 19:05:27 +08:00
committed by GitHub
parent cdb31119f3
commit 003f60fc1a
2 changed files with 31 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vlib/x/json2/decoder.v
View File

@@ -92,13 +92,9 @@ fn (mut p Parser) decode() ?Any {
}
fn (mut p Parser) decode_value() ?Any {
if p.n_level == 500 {
if p.n_level + 1 == 500 {
return error(p.emit_error('reached maximum nesting level of 500'))
}
if (p.tok.kind == .lsbr && p.n_tok.kind == .lcbr)
|| (p.p_tok.kind == p.tok.kind && p.tok.kind == .lsbr) {
p.n_level++
}
match p.tok.kind {
.lsbr {
return p.decode_array()
@@ -150,6 +146,7 @@ fn (mut p Parser) decode_value() ?Any {
fn (mut p Parser) decode_array() ?Any {
mut items := []Any{}
p.next_with_err() ?
p.n_level++
for p.tok.kind != .rsbr {
item := p.decode_value() ?
items << item
@@ -169,12 +166,14 @@ fn (mut p Parser) decode_array() ?Any {
}
}
p.next_with_err() ?
p.n_level--
return Any(items)
}
fn (mut p Parser) decode_object() ?Any {
mut fields := map[string]Any{}
p.next_with_err() ?
p.n_level++
for p.tok.kind != .rcbr {
is_key := p.tok.kind == .str_ && p.n_tok.kind == .colon
if !is_key {
@@ -196,5 +195,6 @@ fn (mut p Parser) decode_object() ?Any {
}
}
p.next_with_err() ?
p.n_level--
return Any(fields)
}