diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-12 23:17:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-12 23:17:08 +0100 |
| commit | 5ce18cbdb9aa1e48e091376afeba4ca67408af06 (patch) | |
| tree | b1e08d43dcc5f95b5afe2061d5f6d0aaf5b9aaa7 /core/io | |
| parent | ceac8a780eb50ec7b28c8e7a824bf3ab3c1fd629 (diff) | |
| parent | d5071a940d00d7d41d6d2dc199c174bf9991e016 (diff) | |
Merge pull request #7743 from karroffel/json_parsing-3.0
JSON::parse reports errors on open-ended objects (master)
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/json.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/json.cpp b/core/io/json.cpp index ac5b8f1e5f..5ade25aab4 100644 --- a/core/io/json.cpp +++ b/core/io/json.cpp @@ -374,7 +374,7 @@ Error JSON::_parse_array(Array &array,const CharType *p_str,int &index, int p_le } - return OK; + return ERR_PARSE_ERROR; } @@ -446,7 +446,7 @@ Error JSON::_parse_object(Dictionary &object,const CharType *p_str,int &index, i } } - return OK; + return ERR_PARSE_ERROR; } |