Merge pull request #7533 from GodotExplorer/pr-json-empty-string

Fix error while JSON::parse with empty string

Merge pull request #7533 from GodotExplorer/pr-json-empty-string
47365e06 · Rémi Verschelde · GitHub · 5dde810a · c8e9937e · 47365e06
Commit 47365e06 authored Jan 15, 2017 by Rémi Verschelde Committed by GitHub Jan 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

json.cpp core/io/json.cpp +1 -1

No files found.
--- a/core/io/json.cpp
+++ b/core/io/json.cpp
@@ -100,7 +100,7 @@ String JSON::print(const Variant& p_var) {

 Error JSON::_get_token(const CharType *p_str, int &idx, int p_len, Token& r_token,int &line,String &r_err_str) {

-	while (true) {
+	while (p_len > 0) {
 		switch(p_str[idx]) {

 			case '\n': {