3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-15 09:55:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not violate UTF-8 in XML output

Browse Source 
According to UTF-8 encoding rules, there are no valid one byte long codepoints which start with a bigh bit set (i.e. 0x80 or higher value). Hence such XML output needs to be escaped, same as a control character.
This commit is contained in:
Bronek Kozicki
2018-03-12 20:34:13 +00:00
parent e11508b48a
commit 27fa7218ca
7 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/internal/catch_xmlwriter.cpp
View File

@@ -45,10 +45,14 @@ namespace Catch {
default:
// Escape control chars - based on contribution by @espenalb in PR #465 and
// by @mrpi PR #588
if ( ( c >= 0 && c < '\x09' ) || ( c > '\x0D' && c < '\x20') || c=='\x7F' ) {
// Also take care to avoid violation of UTF-8 encoding rules
if ( ( c >= 0 && c < '\x09' )
|| ( c > '\x0D' && c < '\x20')
|| ( c & 0x80 )
|| c=='\x7F') {
// see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
os << "\\x" << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
<< static_cast<int>( c );
<< static_cast<int>( static_cast<unsigned char>(c) );
}
else
os << c;