summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-07-23 10:01:33 +0200
committerGitHub <noreply@github.com>2020-07-23 10:01:33 +0200
commit2267caa4a11590a0cd2d71ba47210935bd9bb74d (patch)
tree0bcf37d773032ea3868757034e4e2e90de359d67
parentf0b58928eafd2245aaf11649ff213e5f094b8020 (diff)
parent8f84dfa91d2eac33625432c0b49364df3251fae4 (diff)
Merge pull request #40606 from adam-bates/issue-40396_add_missing_json_errors
issue-40396 - Added missing error strings to JSON parsing when array …
-rw-r--r--core/io/json.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/io/json.cpp b/core/io/json.cpp
index 1c603865ad..b90841a5ef 100644
--- a/core/io/json.cpp
+++ b/core/io/json.cpp
@@ -371,6 +371,7 @@ Error JSON::_parse_array(Array &array, const CharType *p_str, int &index, int p_
need_comma = true;
}
+ r_err_str = "Expected ']'";
return ERR_PARSE_ERROR;
}
@@ -433,6 +434,7 @@ Error JSON::_parse_object(Dictionary &object, const CharType *p_str, int &index,
}
}
+ r_err_str = "Expected '}'";
return ERR_PARSE_ERROR;
}