3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-17 03:02:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Proposal for fixing #464 - invalid XML in output.

Browse Source
This commit is contained in:
Espen Albrektsen 2015-07-17 19:07:19 +02:00
parent 1dd0d4c61a
commit a0f6c9965d
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/internal/catch_xmlwriter.hpp
View File

@ -169,9 +169,26 @@ namespace Catch {
} }
} }
void writeEncodedText( std::string const& text ) { std::string asSafeString( std::string const& text ) {
static const char* charsToEncode = "<&\""; std::string mtext = text;
std::string mtext = text; std::string safe;
for (int ix=0;ix<mtext.length();ix++)
{
char c = mtext[ix];
if ( (c < '\x09') || c=='\x7F'|| (c>'\x0D' && c<'\x20') ) {
std::ostringstream stringStream;
stringStream << "?(" << (int)c << ")";
safe += stringStream.str();
}
else
safe += c;
}
return safe;
}
void writeEncodedText( std::string const& text ) {
static const char* charsToEncode = "<&\"";
std::string mtext = asSafeString(text);
std::string::size_type pos = mtext.find_first_of( charsToEncode ); std::string::size_type pos = mtext.find_first_of( charsToEncode );
while( pos != std::string::npos ) { while( pos != std::string::npos ) {
stream() << mtext.substr( 0, pos ); stream() << mtext.substr( 0, pos );