matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error parsing json with \u

Browse Source
This commit is contained in:
jacob1 2015-10-10 17:37:36 -04:00
parent 3cc27a7c9b
commit da53e7de78
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cajun/reader.cpp
View File

@ -321,7 +321,13 @@ std::string Reader::MatchString(InputStream& inputStream)
case 'n': string.push_back('\n'); break;
case 'r': string.push_back('\r'); break;
case 't': string.push_back('\t'); break;
//case 'u': string.push_back('\u'); break; // TODO: what do we do with this?
// TPT edit: eat \u0000 characters because the TPT font doesn't support them, and if we ignore it the json can't be parsed
case 'u': {
int eat = 4;
while (eat-- && inputStream.EOS() == false && inputStream.Peek() != '"')
inputStream.Get();
break;
}
default: {
std::string sMessage = std::string("Unrecognized escape sequence found in string: \\") + c;
throw ScanException(sMessage, inputStream.GetLocation());