mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper JSON escaping

Browse Source
This commit is contained in:
Martin 2014-02-05 21:51:22 +01:00
parent 27ac1051e9
commit 9cb5cb7a0c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
urbackupserver/serverinterface/json.cpp
View File

@ -331,35 +331,35 @@ namespace JSON
return *this;
}
std::string Value::escape(const std::string &t)
std::wstring Value::escape(const std::wstring &t)
{
std::string r;
std::wstring r;
for(size_t i=0;i<t.size();++i)
{
if(t[i]=='\\')
{
r+="\\\\";
r+=L"\\\\";
}
else if(t[i]=='"')
{
r+="\\\"";
r+=L"\\\"";
}
else if(t[i]=='\n')
{
r+="\\n";
r+=L"\\n";
}
else if(t[i]=='\r')
{
r+="\\r";
r+=L"\\r";
}
else if(t[i]<32)
{
std::string hex = byteToHex(t[i]);
std::string hex = byteToHex(static_cast<unsigned char>(t[i]));
if(hex.size()<2)
{
hex="0"+hex;
}
r+="\\x"+hex;
r+=L"\\u00"+widen(hex);
}
else
{
@ -373,8 +373,8 @@ namespace JSON
{
switch(data_type)
{
case str_type: return "\""+escape(*((std::string*)data))+"\"";
case wstr_type: return "\""+escape(Server->ConvertToUTF8(*((std::wstring*)data)))+"\"";
case str_type: return "\""+Server->ConvertToUTF8(escape(Server->ConvertToUnicode(*((std::string*)data))))+"\"";
case wstr_type: return "\""+Server->ConvertToUTF8(escape(*((std::wstring*)data)))+"\"";
case obj_type: return ((Object*)data)->get(compressed);
case array_type: return ((Array*)data)->get(compressed);
case bool_type: return nconvert(*((bool*)data));

2
urbackupserver/serverinterface/json.h
View File

@ -120,7 +120,7 @@ namespace JSON
void init(const wchar_t* val);
void init(long unsigned int val);
std::string escape(const std::string &t);
std::wstring escape(const std::wstring &t);
void *data;
Value_type data_type;