aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-23 17:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix jsonb bug with unclosed string and two commas in a row

Browse Source
This commit is contained in:
Ihor Andrianov
2025-03-16 03:27:40 +02:00
parent 0b22fbd566
commit a878738a1e
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/json/jsonb.rs
View File

@@ -884,6 +884,9 @@ impl Jsonb {
b',' if !first => {
pos += 1; // consume ','
pos = skip_whitespace(input, pos);
if input[pos] == b',' {
bail_parse_error!("2 commas in a row are not allowed")
}
}
_ => {
// Parse key (must be string)
@@ -898,8 +901,11 @@ impl Jsonb {
pos = skip_whitespace(input, pos);
// Parse value - can be any JSON value including another object
pos = self.deserialize_value(input, pos, depth)?;
pos = self.deserialize_value(input, pos, depth + 1)?;
pos = skip_whitespace(input, pos);
if pos < input.len() && !matches!(input[pos], b',' | b'}') {
bail_parse_error!("Should be , or }}")
}
first = false;
}
}
@@ -989,6 +995,8 @@ impl Jsonb {
if quoted && c == quote {
break; // End of string
} else if !quoted && (c == b'"' || c == b'\'') {
bail_parse_error!("Something gone wrong")
} else if c == b'\\' {
// Handle escape sequences
if pos >= input.len() {
@@ -1095,6 +1103,7 @@ impl Jsonb {
pos += 2;
element_type = ElementType::TEXT5;
}
_ => {
bail_parse_error!("Invalid escape sequence: \\{}", esc as char);
}
@@ -2068,6 +2077,10 @@ world""#,
assert!(Jsonb::from_str("}").is_err());
assert!(Jsonb::from_str("]").is_err());
assert!(Jsonb::from_str(r#"{"a":"55,"b":72}"#).is_err());
assert!(Jsonb::from_str(r#"{"a":"55",,"b":72}"#).is_err());
// Unclosed string
assert!(Jsonb::from_str(r#"{"key":"value"#).is_err());