generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-16 06:56:41 +02:00
Code Issues Projects Releases Wiki Activity

fix(XML): Upgrade bundled libexpat to 2.6.2 #4496

Browse Source
This commit is contained in:
Günter Obiltschnig 2024-03-22 08:34:55 +01:00
parent 480f992aa4
commit 77eb14eebd
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XML/include/Poco/XML/expat.h
View File

@ -1066,7 +1066,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
*/ */
#define XML_MAJOR_VERSION 2 #define XML_MAJOR_VERSION 2
#define XML_MINOR_VERSION 6 #define XML_MINOR_VERSION 6
#define XML_MICRO_VERSION 1 #define XML_MICRO_VERSION 2
#ifdef __cplusplus #ifdef __cplusplus
} }

10
XML/src/xmlparse.cpp
View File

@ -1,4 +1,4 @@
/* dd2a9703e301882afe16d198a82689ab225277057f5eab9d079d8606eab736b4 (2.6.1+) /* 2a14271ad4d35e82bde8ba210b4edb7998794bcbae54deab114046a300f9639a (2.6.2+)
__ __ _ __ __ _
___\ \/ /_ __ __ _| |_ ___\ \/ /_ __ __ _| |_
/ _ \\ /| '_ \ / _` | __| / _ \\ /| '_ \ / _` | __|
@ -6258,7 +6258,7 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,
dtd->keepProcessing = dtd->standalone; dtd->keepProcessing = dtd->standalone;
goto endEntityValue; goto endEntityValue;
} }
if (entity->open) { if (entity->open || (entity == parser->m_declEntity)) {
if (enc == parser->m_encoding) if (enc == parser->m_encoding)
parser->m_eventPtr = entityTextPtr; parser->m_eventPtr = entityTextPtr;
result = XML_ERROR_RECURSIVE_ENTITY_REF; result = XML_ERROR_RECURSIVE_ENTITY_REF;
@ -7805,6 +7805,8 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {
static float static float
accountingGetCurrentAmplification(XML_Parser rootParser) { accountingGetCurrentAmplification(XML_Parser rootParser) {
// 1.........1.........12 => 22
const size_t lenOfShortestInclude = sizeof("<!ENTITY a SYSTEM 'b'>") - 1;
const XmlBigCount countBytesOutput const XmlBigCount countBytesOutput
= rootParser->m_accounting.countBytesDirect = rootParser->m_accounting.countBytesDirect
+ rootParser->m_accounting.countBytesIndirect; + rootParser->m_accounting.countBytesIndirect;
@ -7812,7 +7814,9 @@ accountingGetCurrentAmplification(XML_Parser rootParser) {
= rootParser->m_accounting.countBytesDirect = rootParser->m_accounting.countBytesDirect
? (countBytesOutput ? (countBytesOutput
/ (float)(rootParser->m_accounting.countBytesDirect)) / (float)(rootParser->m_accounting.countBytesDirect))
: 1.0f; : ((lenOfShortestInclude
+ rootParser->m_accounting.countBytesIndirect)
/ (float)lenOfShortestInclude);
assert(! rootParser->m_parentParser); assert(! rootParser->m_parentParser);
return amplificationFactor; return amplificationFactor;
} }