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

Merge pull request #2798 from bojidar-bg/patch-6 

Change handling of invalid JSON escape sequences.
This commit is contained in:
Juan Linietsky 2015-11-18 19:41:46 -03:00
parent f0aeb036d1 f59a1fd50d
commit 63e84e1824
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/io/json.cpp
View File

@ -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 'n': res=10; break;
case 'f': res=12; break; case 'f': res=12; break;
case 'r': res=13; break; case 'r': res=13; break;
case '\"': res='\"'; break;
case '\\': res='\\'; break;
case '/': res='/'; break; //wtf
case 'u': { case 'u': {
//hexnumbarh - oct is deprecated //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; } break;
//case '\"': res='\"'; break;
//case '\\': res='\\'; break;
//case '/': res='/'; break;
default: { default: {
res = next;
r_err_str="Invalid escape sequence"; //r_err_str="Invalid escape sequence";
return ERR_PARSE_ERROR; //return ERR_PARSE_ERROR;
} break; } break;
} }