ee6bb0cc76
* gnu/packages/patches/libxml2-CVE-2015-1819.patch, gnu/packages/patches/libxml2-CVE-2015-7941-pt1.patch, gnu/packages/patches/libxml2-CVE-2015-7941-pt2.patch, gnu/packages/patches/libxml2-CVE-2015-7942-pt1.patch, gnu/packages/patches/libxml2-CVE-2015-7942-pt2.patch, gnu/packages/patches/libxml2-CVE-2015-8035.patch, gnu/packages/patches/libxml2-bug-737840.patch, gnu/packages/patches/libxml2-bug-738805.patch, gnu/packages/patches/libxml2-bug-746048.patch, gnu/packages/patches/libxml2-bug-747437.patch, gnu/packages/patches/libxml2-bug-751603.patch, gnu/packages/patches/libxml2-bug-751631.patch, gnu/packages/patches/libxml2-bug-754946.patch, gnu/packages/patches/libxml2-bug-754947.patch, gnu/packages/patches/libxml2-bug-755857.patch, gnu/packages/patches/libxml2-fix-catalog-corruption.patch, gnu/packages/patches/libxml2-id-attrs-in-xmlSetTreeDoc.patch, gnu/packages/patches/libxml2-node-sort-order-pt1.patch, gnu/packages/patches/libxml2-node-sort-order-pt2.patch: New files. * gnu-system.am (dist_patch_DATA): Add them. * gnu/packages/xml.scm (libxml2)[source]: Add patches.
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
From f54d6a929af2a570396f0595a0e29064c908c12e Mon Sep 17 00:00:00 2001
|
|
From: Nick Wellnhofer <wellnhofer@aevum.de>
|
|
Date: Fri, 19 Dec 2014 00:08:35 +0100
|
|
Subject: [PATCH] Account for ID attributes in xmlSetTreeDoc
|
|
|
|
---
|
|
tree.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/tree.c b/tree.c
|
|
index 6ec9223..c6323b4 100644
|
|
--- a/tree.c
|
|
+++ b/tree.c
|
|
@@ -2799,8 +2799,19 @@ xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) {
|
|
if(tree->type == XML_ELEMENT_NODE) {
|
|
prop = tree->properties;
|
|
while (prop != NULL) {
|
|
+ if (prop->atype == XML_ATTRIBUTE_ID) {
|
|
+ xmlRemoveID(tree->doc, prop);
|
|
+ }
|
|
+
|
|
prop->doc = doc;
|
|
xmlSetListDoc(prop->children, doc);
|
|
+
|
|
+ if (xmlIsID(doc, tree, prop)) {
|
|
+ xmlChar *idVal = xmlNodeListGetString(doc, prop->children,
|
|
+ 1);
|
|
+ xmlAddID(NULL, doc, idVal, prop);
|
|
+ }
|
|
+
|
|
prop = prop->next;
|
|
}
|
|
}
|
|
--
|
|
2.6.3
|
|
|