mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
Fix incorrect entity encoding, results in invalid XML.
Pointing this out by jsa@ Obtained from: upstream
This commit is contained in:
parent
214bbf08ba
commit
3c4a7f750a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=258263
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= tinyxml
|
||||
PORTVERSION= 2.6.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= textproc
|
||||
MASTER_SITES= SF
|
||||
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
|
||||
|
34
textproc/tinyxml/files/patch-tinyxml.cpp
Normal file
34
textproc/tinyxml/files/patch-tinyxml.cpp
Normal file
@ -0,0 +1,34 @@
|
||||
--- tinyxml.cpp.orig 2010-03-23 13:16:36.000000000 +0800
|
||||
+++ tinyxml.cpp 2010-07-26 15:28:06.000000000 +0800
|
||||
@@ -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;
|
Loading…
Reference in New Issue
Block a user