diff options
author | RSzibele <RSzibele@server.fake> | 2012-12-31 11:13:55 +0100 |
---|---|---|
committer | RSzibele <RSzibele@server.fake> | 2012-12-31 11:13:55 +0100 |
commit | e66e926121e01d592e2c6d2197d8de2d80c0afd9 (patch) | |
tree | be790ae8d32937d3a4902195e158cdf372071cfc /pkgs/development/libraries/tinyxml/2.6.2-entity.patch | |
parent | 60de7967da5ab22c503ad5a3a582f091ded0ea5d (diff) | |
download | nixpkgs-e66e926121e01d592e2c6d2197d8de2d80c0afd9.tar nixpkgs-e66e926121e01d592e2c6d2197d8de2d80c0afd9.tar.gz nixpkgs-e66e926121e01d592e2c6d2197d8de2d80c0afd9.tar.bz2 nixpkgs-e66e926121e01d592e2c6d2197d8de2d80c0afd9.tar.lz nixpkgs-e66e926121e01d592e2c6d2197d8de2d80c0afd9.tar.xz nixpkgs-e66e926121e01d592e2c6d2197d8de2d80c0afd9.tar.zst nixpkgs-e66e926121e01d592e2c6d2197d8de2d80c0afd9.zip |
Added TinyXML-2.6.2.
Diffstat (limited to 'pkgs/development/libraries/tinyxml/2.6.2-entity.patch')
-rwxr-xr-x | pkgs/development/libraries/tinyxml/2.6.2-entity.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/pkgs/development/libraries/tinyxml/2.6.2-entity.patch b/pkgs/development/libraries/tinyxml/2.6.2-entity.patch new file mode 100755 index 00000000000..3164261291b --- /dev/null +++ b/pkgs/development/libraries/tinyxml/2.6.2-entity.patch @@ -0,0 +1,64 @@ +? entity.patch +Index: a/tinyxml.cpp +=================================================================== +RCS file: b/tinyxml.cpp,v +retrieving revision 1.105 +diff -u -r1.105 a/tinyxml.cpp +--- tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105 ++++ tinyxml.cpp 19 Jul 2010 21:24:16 -0000 +@@ -57,30 +57,7 @@ + { + 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. +- // © -- 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: a/xmltest.cpp +=================================================================== +RCS file: b/xmltest.cpp,v +retrieving revision 1.89 +diff -u -r1.89 a/xmltest.cpp +--- xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89 ++++ xmltest.cpp 19 Jul 2010 21:24:16 -0000 +@@ -1340,6 +1340,16 @@ + }*/ + } + ++ #ifdef TIXML_USE_STL ++ { ++ TiXmlDocument xml; ++ xml.Parse("<foo>foo&#xa+bar</foo>"); ++ std::string str; ++ str << xml; ++ XmlTest( "Entity escaping", "<foo>foo&#xa+bar</foo>", str.c_str() ); ++ } ++ #endif ++ + /* 1417717 experiment + { + TiXmlDocument xml; |