generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-20 22:31:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #315 from fbraem/develop

Browse Source 
Solve wrong escaping of unicode characters
This commit is contained in:
Aleksandar Fabijanic 2014-03-11 20:29:18 -05:00
commit 1cd745996c
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
JSON/src/Stringifier.cpp
View File

@ -92,41 +92,41 @@ void Stringifier::formatString(const std::string& value, std::ostream& out)
out << '"';
for (std::string::const_iterator it = value.begin(); it != value.end(); ++it)
{
switch (*it)
{
case '"':
if (*it == 0x20 ||
*it == 0x21 ||
(*it >= 0x23 && *it <= 0x2E) ||
(*it >= 0x30 && *it <= 0x5B) ||
(*it >= 0x5D && *it <= 0xFF))
out << *it;
else if (*it == '"')
out << "\\\"";
break;
case '\\':
else if (*it == '\\')
out << "\\\\";
break;
case '\b':
else if (*it == '\b')
out << "\\b";
break;
case '\f':
else if (*it == '\f')
out << "\\f";
break;
case '\n':
else if (*it == '\n')
out << "\\n";
break;
case '\r':
else if (*it == '\r')
out << "\\r";
break;
case '\t':
else if (*it == '\t')
out << "\\t";
break;
default:
else if ( *it == '\0' )
out << "\\u0000";
else
{
if ( *it > 0 && *it <= 0x1F )
{
out << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4) << static_cast<int>(*it);
}
else
{
out << *it;
}
break;
}
const char *hexdigits = "0123456789ABCDEF";
unsigned long u = (std::min)(static_cast<unsigned long>(static_cast<unsigned char>(*it)), 0xFFFFul);
int d1 = u / 4096; u -= d1 * 4096;
int d2 = u / 256; u -= d2 * 256;
int d3 = u / 16; u -= d3 * 16;
int d4 = u;
out << "\\u";
out << hexdigits[d1];
out << hexdigits[d2];
out << hexdigits[d3];
out << hexdigits[d4];
}
}
out << '"';

16
MongoDB/include/Poco/MongoDB/MessageHeader.h
View File

@ -76,7 +76,7 @@ public:
void write(BinaryWriter& writer);
/// Writes the header
std::size_t getMessageLength() const;
Int32 getMessageLength() const;
/// Returns the message length
OpCode opCode() const;
@ -95,13 +95,13 @@ private:
MessageHeader(OpCode opcode);
/// Constructor.
void setMessageLength(std::size_t length);
void setMessageLength(Int32 length);
/// Sets the message length
std::size_t _messageLength;
Int32 _requestID;
Int32 _responseTo;
OpCode _opCode;
Int32 _messageLength;
Int32 _requestID;
Int32 _responseTo;
OpCode _opCode;
friend class Message;
};
@ -113,13 +113,13 @@ inline MessageHeader::OpCode MessageHeader::opCode() const
}
inline std::size_t MessageHeader::getMessageLength() const
inline Int32 MessageHeader::getMessageLength() const
{
return _messageLength;
}
inline void MessageHeader::setMessageLength(std::size_t length)
inline void MessageHeader::setMessageLength(Int32 length)
{
_messageLength = MSG_HEADER_SIZE + length;
}