File tinyxml-entity.patch of Package tinyxml

Overview Repositories Revisions Requests Users Attributes Meta

File tinyxml-entity.patch of Package tinyxml (Revision 2a19dcee6af161135a993387b4abdf97)

Currently displaying revision 2a19dcee6af161135a993387b4abdf97 , Show latest

? entity.patch
Index: tinyxml.cpp
===================================================================
--- tinyxml.cpp.orig	2010-11-04 15:33:06.473418438 +0100
+++ tinyxml.cpp	2010-11-04 15:33:06.597440320 +0100
@@ -57,30 +57,7 @@ void TiXmlBase::EncodeString( const TIXM
 	{
 		unsigned char c = (unsigned char) str[i];
 
-		if (    c == '&' 
-		     && i < ( (int)str.length() - 2 )
-			 && str[i+1] == '#'
-			 && str[i+2] == 'x' )
-		{
-			// Hexadecimal character reference.
-			// Pass through unchanged.
-			// &#xA9;	-- copyright symbol, for example.
-			//
-			// The -1 is a bug fix from Rob Laveaux. It keeps
-			// an overflow from happening if there is no ';'.
-			// There are actually 2 ways to exit this loop -
-			// while fails (error case) and break (semicolon found).
-			// However, there is no mechanism (currently) for
-			// this function to return an error.
-			while ( i<(int)str.length()-1 )
-			{
-				outString->append( str.c_str() + i, 1 );
-				++i;
-				if ( str[i] == ';' )
-					break;
-			}
-		}
-		else if ( c == '&' )
+		if ( c == '&' )
 		{
 			outString->append( entity[0].str, entity[0].strLength );
 			++i;
Index: xmltest.cpp
===================================================================
--- xmltest.cpp.orig	2010-11-04 15:33:06.553432556 +0100
+++ xmltest.cpp	2010-11-04 15:33:06.597440320 +0100
@@ -1338,6 +1338,16 @@ int main()
 		}*/
 	}
 
+	#ifdef TIXML_USE_STL
+	{
+		TiXmlDocument xml;
+		xml.Parse("<foo>foo&amp;#xa+bar</foo>");
+		std::string str;
+		str << xml;
+		XmlTest( "Entity escaping", "<foo>foo&amp;#xa+bar</foo>", str.c_str() );
+	}
+	#endif
+
 	/*  1417717 experiment
 	{
 		TiXmlDocument xml;

Places

File tinyxml-entity.patch of Package tinyxml (Revision 2a19dcee6af161135a993387b4abdf97)

Places