ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 07:08:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1736 from Kelimion/fix_json_unmarshal

Browse Source 
Fix unmarshal for escaped strings.
This commit is contained in:
Jeroen van Rijn
2022-04-19 20:05:04 +02:00
committed by GitHub
parent b51358a01c 581255bf23
commit d869ba7bcd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/encoding/json/parser.odin
+5
View File
@@ -281,6 +281,11 @@ parse_object :: proc(p: ^Parser) -> (value: Value, err: Error) {
// IMPORTANT NOTE(bill): unquote_string assumes a mostly valid string // IMPORTANT NOTE(bill): unquote_string assumes a mostly valid string
unquote_string :: proc(token: Token, spec: Specification, allocator := context.allocator) -> (value: string, err: Error) { unquote_string :: proc(token: Token, spec: Specification, allocator := context.allocator) -> (value: string, err: Error) {
if allocator.data == nil {
// We were called from `unmarshal_count_array`, return early.
return "", nil
}
get_u2_rune :: proc(s: string) -> rune { get_u2_rune :: proc(s: string) -> rune {
if len(s) < 4 || s[0] != '\\' || s[1] != 'x' { if len(s) < 4 || s[0] != '\\' || s[1] != 'x' {
return -1 return -1