summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorBojidar Marinov <bojidar.marinov.bg@gmail.com>2015-11-16 17:05:39 +0200
committerBojidar Marinov <bojidar.marinov.bg@gmail.com>2015-11-16 17:05:39 +0200
commitf59a1fd50d3e2df4ea9fa9e43544c2886ebc78f1 (patch)
tree6c949b3e843a52d02620f8507fab3e79bcd89b1f /core
parent48113130566e5aba8d794df7d22947edda3fca38 (diff)
Change handling of invalid JSON escape sequences.
Instead of reporting an error, just ignore the first backslash and continue. Fixes #2521
Diffstat (limited to 'core')
-rw-r--r--core/io/json.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/io/json.cpp b/core/io/json.cpp
index 14890abd26..22c99d0465 100644
--- a/core/io/json.cpp
+++ b/core/io/json.cpp
@@ -177,9 +177,6 @@ Error JSON::_get_token(const CharType *p_str, int &idx, int p_len, Token& r_toke
case 'n': res=10; break;
case 'f': res=12; break;
case 'r': res=13; break;
- case '\"': res='\"'; break;
- case '\\': res='\\'; break;
- case '/': res='/'; break; //wtf
case 'u': {
//hexnumbarh - oct is deprecated
@@ -218,10 +215,13 @@ Error JSON::_get_token(const CharType *p_str, int &idx, int p_len, Token& r_toke
} break;
+ //case '\"': res='\"'; break;
+ //case '\\': res='\\'; break;
+ //case '/': res='/'; break;
default: {
-
- r_err_str="Invalid escape sequence";
- return ERR_PARSE_ERROR;
+ res = next;
+ //r_err_str="Invalid escape sequence";
+ //return ERR_PARSE_ERROR;
} break;
}