godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40606 from adam-bates/issue-40396_add_missing_json_errors 

issue-40396 - Added missing error strings to JSON parsing when array …
This commit is contained in:
Rémi Verschelde 2020-07-23 10:01:33 +02:00 committed by GitHub
parent f0b58928ea 8f84dfa91d
commit 2267caa4a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/io/json.cpp
View File

@ -371,6 +371,7 @@ Error JSON::_parse_array(Array &array, const CharType *p_str, int &index, int p_
need_comma = true; need_comma = true;
} }
r_err_str = "Expected ']'";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
@ -433,6 +434,7 @@ Error JSON::_parse_object(Dictionary &object, const CharType *p_str, int &index,
} }
} }
r_err_str = "Expected '}'";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }