diff -Nru xerces-c-3.2.3+debian/debian/changelog xerces-c-3.2.3+debian/debian/changelog --- xerces-c-3.2.3+debian/debian/changelog 2020-12-11 16:22:23.000000000 +0000 +++ xerces-c-3.2.3+debian/debian/changelog 2020-12-14 16:43:13.000000000 +0000 @@ -1,3 +1,9 @@ +xerces-c (3.2.3+debian-3) unstable; urgency=medium + + * Fix MemHandlerTest1 on 32-bit systems to compensate for CVE-2018-1311 fix + + -- William Blough Mon, 14 Dec 2020 11:43:13 -0500 + xerces-c (3.2.3+debian-2) unstable; urgency=medium [ Sylvain Beucler ] diff -Nru xerces-c-3.2.3+debian/debian/patches/CVE-2018-1311-mitigation.patch xerces-c-3.2.3+debian/debian/patches/CVE-2018-1311-mitigation.patch --- xerces-c-3.2.3+debian/debian/patches/CVE-2018-1311-mitigation.patch 2020-12-11 16:22:23.000000000 +0000 +++ xerces-c-3.2.3+debian/debian/patches/CVE-2018-1311-mitigation.patch 2020-12-14 16:43:13.000000000 +0000 @@ -1,10 +1,8 @@ https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2018-1311 -Index: xerces-c-3.2.2+debian/src/xercesc/internal/IGXMLScanner.cpp -=================================================================== ---- xerces-c-3.2.2+debian.orig/src/xercesc/internal/IGXMLScanner.cpp -+++ xerces-c-3.2.2+debian/src/xercesc/internal/IGXMLScanner.cpp +--- a/src/xercesc/internal/IGXMLScanner.cpp ++++ b/src/xercesc/internal/IGXMLScanner.cpp @@ -1532,7 +1532,6 @@ void IGXMLScanner::scanDocTypeDecl() DTDEntityDecl* declDTD = new (fMemoryManager) DTDEntityDecl(gDTDStr, false, fMemoryManager); declDTD->setSystemId(sysId); @@ -21,10 +19,8 @@ // Mark this one as a throw at end newReader->setThrowAtEnd(true); -Index: xerces-c-3.2.2+debian/tests/expected/MemHandlerTest1.log -=================================================================== ---- xerces-c-3.2.2+debian.orig/tests/expected/MemHandlerTest1.log -+++ xerces-c-3.2.2+debian/tests/expected/MemHandlerTest1.log +--- a/tests/expected/MemHandlerTest1.log ++++ b/tests/expected/MemHandlerTest1.log @@ -1,4 +1,4 @@ -At destruction, domBuilderMemMonitor has 0 bytes. -At destruction, sax2MemMonitor has 0 bytes. @@ -33,3 +29,24 @@ +At destruction, sax2MemMonitor has 276 bytes. +At destruction, sax1MemMonitor has 276 bytes. At destruction, staticMemMonitor has 0 bytes. +--- /dev/null ++++ b/tests/expected/MemHandlerTest1_32.log +@@ -0,0 +1,4 @@ ++At destruction, domBuilderMemMonitor has 180 bytes. ++At destruction, sax2MemMonitor has 180 bytes. ++At destruction, sax1MemMonitor has 180 bytes. ++At destruction, staticMemMonitor has 0 bytes. +--- a/scripts/run-test.in ++++ b/scripts/run-test.in +@@ -46,6 +46,11 @@ run_test() { + sed -i -e 's;\( *[0-9][0-9]* *ms *\);{timing removed};' "$output" + + exp=$(cat "${srcdir}/expected/${name}.log") ++ ++ if [ "${name}" = "MemHandlerTest1" ] && [ "$(dpkg-architecture -q DEB_HOST_ARCH_BITS)" -eq 32 ]; then ++ exp=$(cat "${srcdir}/expected/${name}_32.log") ++ fi ++ + obs=$(cat "$output") + + echo "------"