potok/tinyxml2
1
0
Fork 0
mirror of https://github.com/leethomason/tinyxml2.git synced 2026-07-21 19:23:00 +04:00
Code Packages Releases Wiki Activity

Merge pull request #1021 from Malcohol/Malcohol/optionalAposHandling

Browse Source 
Optional Apos escaping
This commit is contained in:
Lee Thomason
2025-06-08 11:17:12 -07:00
committed by GitHub
parent a93163d2f5 f87d0e3077
commit 30dee1efa0
3 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tinyxml2.cpp
+6 -4
View File
@@ -2577,7 +2577,7 @@ void XMLDocument::PopDepth()
--_parsingDepth;
}
XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth, EscapeAposCharsInAttributes aposInAttributes ) :
_elementJustOpened( false ),
_stack(),
_firstElement( true ),
@@ -2594,9 +2594,11 @@ XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
}
for( int i=0; i<NUM_ENTITIES; ++i ) {
const char entityValue = entities[i].value;
const unsigned char flagIndex = static_cast<unsigned char>(entityValue);
TIXMLASSERT( flagIndex < ENTITY_RANGE );
_entityFlag[flagIndex] = true;
if ((aposInAttributes == ESCAPE_APOS_CHARS_IN_ATTRIBUTES) || (entityValue != SINGLE_QUOTE)) {
const unsigned char flagIndex = static_cast<unsigned char>(entityValue);
TIXMLASSERT( flagIndex < ENTITY_RANGE );
_entityFlag[flagIndex] = true;
}
}
_restrictedEntityFlag[static_cast<unsigned char>('&')] = true;
_restrictedEntityFlag[static_cast<unsigned char>('<')] = true;
tinyxml2.h
+6 -1
View File
@@ -2239,13 +2239,18 @@ private:
class TINYXML2_LIB XMLPrinter : public XMLVisitor
{
public:
enum EscapeAposCharsInAttributes {
ESCAPE_APOS_CHARS_IN_ATTRIBUTES,
DONT_ESCAPE_APOS_CHARS_IN_ATTRIBUTES
};
/** Construct the printer. If the FILE* is specified,
this will print to the FILE. Else it will print
to memory, and the result is available in CStr().
If 'compact' is set to true, then output is created
with only required whitespace and newlines.
*/
XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 );
XMLPrinter( FILE* file=0, bool compact = false, int depth = 0, EscapeAposCharsInAttributes aposInAttributes = ESCAPE_APOS_CHARS_IN_ATTRIBUTES );
virtual ~XMLPrinter() {}
/** If streaming, write the BOM and declaration. */
xmltest.cpp
+35
View File
@@ -2695,6 +2695,41 @@ int main( int argc, const char ** argv )
XMLTest("Test attribute encode with a Hex value", value5, "!"); // hex value in unicode value
}
// ---------- XMLPrinter Apos Escaping ------
{
const char* testText = "text containing a ' character";
XMLDocument doc;
XMLElement* element = doc.NewElement( "element" );
doc.InsertEndChild( element );
element->SetAttribute( "attrib", testText );
{
XMLPrinter defaultPrinter;
doc.Print( &defaultPrinter );
const char* defaultOutput = defaultPrinter.CStr();
const bool foundTextWithUnescapedApos = (strstr(defaultOutput, testText) != nullptr);
XMLTest("Default XMLPrinter should escape ' characters", false, foundTextWithUnescapedApos);
{
XMLDocument parsingDoc;
parsingDoc.Parse(defaultOutput);
const XMLAttribute* attrib = parsingDoc.FirstChildElement("element")->FindAttribute("attrib");
XMLTest("Default XMLPrinter should output parsable xml", testText, attrib->Value(), true);
}
}
{
XMLPrinter customPrinter(0, false, 0, XMLPrinter::DONT_ESCAPE_APOS_CHARS_IN_ATTRIBUTES);
doc.Print( &customPrinter );
const char* customOutput = customPrinter.CStr();
const bool foundTextWithUnescapedApos = (strstr(customOutput, testText) != nullptr);
XMLTest("Custom XMLPrinter should not escape ' characters", true, foundTextWithUnescapedApos);
{
XMLDocument parsingDoc;
parsingDoc.Parse(customOutput);
const XMLAttribute* attrib = parsingDoc.FirstChildElement("element")->FindAttribute("attrib");
XMLTest("Custom XMLPrinter should output parsable xml", testText, attrib->Value(), true);
}
}
}
// ----------- Performance tracking --------------
{
#if defined( _MSC_VER )