download.lst | 4 ++--
sw/qa/extras/htmlexport/htmlexport.cxx | 16 ++++++++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 91fcb290ab0cc26a8ec584da9610f553fd27ac97
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Apr 18 11:23:39 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Apr 26 11:39:10 2023 +0200
libxml2: upgrade to release 2.10.4
Fixes CVE-2023-29469 and CVE-2023-28484.
Also: SAX2: Ignore namespaces in HTML documents
which is probably the reason why one test fails, so switch it to parsing
XML:
HTML parser error : Tag reqif-xhtml:div invalid
<reqif-xhtml:div>
HTML parser error : Tag reqif-xhtml:table invalid
<reqif-xhtml:table cellpadding="2" cellspacing="2">
...
reqif-table.xhtml:
C:/cygwin/home/tdf/jenkins/workspace/gerrit_windows/test/source/xmltesttools.cxx:195:testReqIfTable::Import_Export
equality assertion failed
- Expected: 1
- Actual : 0
- In
<file:///C:/cygwin/home/tdf/jenkins/workspace/gerrit_windows/tempdir/lu134607bxu8q.tmp>,
XPath '/html/body/div/table/tr/th' number of nodes is incorrect
Change-Id: Icc161b39515c996193366bc777a67eca79e4e892
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150544
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit a65f34a536bb37b890c6ee7e506fea63b9dcaac1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150615
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 5f6a3b70f8336d6dfb03eea77d860b0199287f77)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150621
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/download.lst b/download.lst
index 22a309ae0a8b..21a9fb8dc546 100644
--- a/download.lst
+++ b/download.lst
@@ -340,8 +340,8 @@ XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBXML_SHA256SUM :=
5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
-LIBXML_VERSION_MICRO := 3
+LIBXML_SHA256SUM :=
ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45
+LIBXML_VERSION_MICRO := 4
LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
# three static lines
# so that git cherry-pick
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 8ed189b44bb0..26afe533410a 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -777,16 +777,24 @@ DECLARE_HTMLEXPORT_TEST(testReqIfJpgImg,
"reqif-jpg-img.xhtml")
DECLARE_HTMLEXPORT_TEST(testReqIfTable, "reqif-table.xhtml")
{
- htmlDocUniquePtr pDoc = parseHtml(maTempFile);
+ SvMemoryStream aStream;
+ WrapReqifFromTempFile(aStream);
+ xmlDocUniquePtr pDoc = parseXmlStream(&aStream);
CPPUNIT_ASSERT(pDoc);
// <div> was missing, so the XHTML fragment wasn't a valid
// xhtml.BlkStruct.class type anymore.
- assertXPath(pDoc, "/html/body/div/table/tr/th", 1);
+ assertXPath(pDoc,
+
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr/reqif-xhtml:th",
+ 1);
// Make sure that the cell background is not written using CSS.
- assertXPathNoAttribute(pDoc, "/html/body/div/table/tr/th", "style");
+ assertXPathNoAttribute(
+ pDoc,
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr/reqif-xhtml:th",
+ "style");
// The attribute was present, which is not valid in reqif-xhtml.
- assertXPathNoAttribute(pDoc, "/html/body/div/table/tr/th", "bgcolor");
+ assertXPathNoAttribute(
+ pDoc,
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:table/reqif-xhtml:tr/reqif-xhtml:th",
+ "bgcolor");
}
DECLARE_HTMLEXPORT_TEST(testReqIfTable2, "reqif-table2.odt")
