diff options
| author | Rémi Verschelde | 2017-02-12 23:17:11 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-12 23:17:11 +0100 |
| commit | 331ff9db77793196e93a9060c67b7b4faac90be0 (patch) | |
| tree | ea2e8c118d459efaf63c28cb169e1a7158335f27 /core | |
| parent | 3b09d7720838142bb76c6ff8fa7b0dbded5ee813 (diff) | |
| parent | 85793ccc4a03ec575c9fdf603585fc42207ad40b (diff) | |
| download | godot-331ff9db77793196e93a9060c67b7b4faac90be0.tar.gz godot-331ff9db77793196e93a9060c67b7b4faac90be0.tar.zst godot-331ff9db77793196e93a9060c67b7b4faac90be0.zip | |
Merge pull request #7742 from karroffel/json_parsing
JSON::parse reports errors on open-ended objects
Diffstat (limited to 'core')
| -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 f42155bc9..fac8ebe72 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; } |