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

Merge pull request #7743 from karroffel/json_parsing-3.0 

JSON::parse reports errors on open-ended objects (master)
This commit is contained in:
Rémi Verschelde 2017-02-12 23:17:08 +01:00 committed by GitHub
parent ceac8a780e d5071a940d
commit 5ce18cbdb9
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;
}