haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

TinyXML: applied Gentoo patches, kodi needs them (#5760)

Browse Source
This commit is contained in:
extrowerk
2021-03-06 11:49:07 +01:00
committed by GitHub
parent b6ad961237
commit 3bd5912992
2 changed files with 82 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
dev-libs/tinyxml/patches/tinyxml-2.6.2.patchset Normal file
View File

@@ -0,0 +1,80 @@
From b26eb7cfd1164c717ece02c8fe2ee0bee9f21505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Fri, 5 Mar 2021 09:07:15 +0100
Subject: Gentoo patches: tinyxml-2.6.1-entity.patch,
tinyxml-2.6.2-defineSTL.patch
diff --git a/tinyxml.cpp b/tinyxml.cpp
index 9c161df..fccd8dc 100644
--- a/tinyxml.cpp
+++ b/tinyxml.cpp
@@ -57,30 +57,7 @@ void TiXmlBase::EncodeString( const TIXML_STRING& str, TIXML_STRING* outString )
{
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;
diff --git a/tinyxml.h b/tinyxml.h
index a3589e5..a6201b6 100644
--- a/tinyxml.h
+++ b/tinyxml.h
@@ -26,6 +26,8 @@ distribution.
#ifndef TINYXML_INCLUDED
#define TINYXML_INCLUDED
+#define TIXML_USE_STL 1
+
#ifdef _MSC_VER
#pragma warning( push )
#pragma warning( disable : 4530 )
diff --git a/xmltest.cpp b/xmltest.cpp
index 663c157..b38587f 100644
--- a/xmltest.cpp
+++ b/xmltest.cpp
@@ -1366,6 +1366,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;
--
2.30.0