maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7742 from karroffel/json_parsing

Browse source 
JSON::parse reports errors on open-ended objects
This commit is contained in:
Rémi Verschelde 2017-02-12 23:17:11 +01:00 committed by GitHub
parent 3b09d77208 85793ccc4a
commit 331ff9db77
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/io/json.cpp
View file

@ -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;
}