PR#7: 2.9.10-2 - Fix relaxed approach to nested documents on object disposal - rpms/libxml2

Jan Pokorný • 4 years ago

da0f71b

file added

+33

		`@@ -0,0 +1,33 @@`
		`+ From 0815302dee2b78139832c2080348086a0564836b Mon Sep 17 00:00:00 2001`
		`+ From: Nick Wellnhofer <wellnhofer@aevum.de>`
		`+ Date: Fri, 6 Dec 2019 12:27:29 +0100`
		`+ Subject: [PATCH] Fix freeing of nested documents`
		`+`
		`+ Apparently, some libxslt RVTs can contain nested document nodes, see`
		`+ issue #132. I'm not sure how this happens exactly but it can cause a`
		`+ segfault in xmlFreeNodeList after the changes in commit 0762c9b6.`
		`+`
		+ Make sure not to touch the (nonexistent) `content` member of xmlDocs.
		`+ ---`
		`+ tree.c \| 5 +++++`
		`+ 1 file changed, 5 insertions(+)`
		`+`
		`+ diff --git a/tree.c b/tree.c`
		`+ index 070670f1..0d7fc98c 100644`
		`+ --- a/tree.c`
		`+ +++ b/tree.c`
		`+ @@ -3708,6 +3708,11 @@ xmlFreeNodeList(xmlNodePtr cur) {`
		`+ (cur->type != XML_XINCLUDE_START) &&`
		`+ (cur->type != XML_XINCLUDE_END) &&`
		`+ (cur->type != XML_ENTITY_REF_NODE) &&`
		`+ + (cur->type != XML_DOCUMENT_NODE) &&`
		`+ +#ifdef LIBXML_DOCB_ENABLED`
		`+ + (cur->type != XML_DOCB_DOCUMENT_NODE) &&`
		`+ +#endif`
		`+ + (cur->type != XML_HTML_DOCUMENT_NODE) &&`
		`+ (cur->content != (xmlChar *) &(cur->properties))) {`
		`+ DICT_FREE(cur->content)`
		`+ }`
		`+ --`
		`+ 2.22.0`
		`+`

libxml2.spec

file modified

+5 -1

		`@@ -1,6 +1,6 @@`
		`Name: libxml2`
		`Version: 2.9.10`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Summary: Library providing XML and HTML support`

		`License: MIT`
		`@@ -10,6 +10,7 @@`
		`# Patch from openSUSE.`
		`# See: https://bugzilla.gnome.org/show_bug.cgi?id=789714`
		`Patch1: libxml2-2.9.8-python3-unicode-errors.patch`
		`+ Patch2: https://gitlab.gnome.org/GNOME/libxml2/commit/0815302dee2b78139832c2080348086a0564836b.patch#/fix-relaxed-approach-to-nested-documents.patch`

		`BuildRequires: gcc`
		`BuildRequires: make`
		`@@ -138,6 +139,9 @@`
		`%{python3_sitearch}/libxml2mod.so`

		`%changelog`
		`+ * Mon Dec 09 2019 Jan Pokorny <jpokorny@fedoraproject.org> - 2.9.10-2`
		`+ - Fix relaxed approach to nested documents on object disposal (#1780573)`
		`+`
		`* Fri Nov 01 2019 David King <amigadave@amigadave.com> - 2.9.10-1`
		`- Update to 2.9.10 (#1767151)`

(#1780573)

Hello?!

Can you, at least, make me co-admin the package so I can run with
the new build here, please?

Received co-admin rights, merged this by hand (magic words were inactive
at that time, enabled since), set to build for Rawhide
(https://koji.fedoraproject.org/koji/taskinfo?taskID=40077940)
and where the 2.9.10 originally landed.

Edited 4 years ago by jpokorny

Pull-Request has been closed by jpokorny

4 years ago