From f59a1fd50d3e2df4ea9fa9e43544c2886ebc78f1 Mon Sep 17 00:00:00 2001 From: Bojidar Marinov Date: Mon, 16 Nov 2015 17:05:39 +0200 Subject: [PATCH] Change handling of invalid JSON escape sequences. Instead of reporting an error, just ignore the first backslash and continue. Fixes #2521 --- core/io/json.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/io/json.cpp b/core/io/json.cpp index 14890abd266..22c99d0465a 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; }