summaryrefslogtreecommitdiffstats
path: root/source/l/libxml2/0001-Fix-attribute-decoding-during-XML-schema-validation.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/l/libxml2/0001-Fix-attribute-decoding-during-XML-schema-validation.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/libxml2/0001-Fix-attribute-decoding-during-XML-schema-validation.diff')
-rw-r--r--source/l/libxml2/0001-Fix-attribute-decoding-during-XML-schema-validation.diff67
1 files changed, 0 insertions, 67 deletions
diff --git a/source/l/libxml2/0001-Fix-attribute-decoding-during-XML-schema-validation.diff b/source/l/libxml2/0001-Fix-attribute-decoding-during-XML-schema-validation.diff
deleted file mode 100644
index 6dbaddcd8..000000000
--- a/source/l/libxml2/0001-Fix-attribute-decoding-during-XML-schema-validation.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-From 256366ed60f8795279b25f7b7b55e8089b4c6ff4 Mon Sep 17 00:00:00 2001
-From: Alex Henrie <alexhenrie24@gmail.com>
-Date: Thu, 26 May 2016 17:38:35 -0600
-Subject: [PATCH] Fix attribute decoding during XML schema validation
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=766834
-
-vctxt->parserCtxt is always NULL in xmlSchemaSAXHandleStartElementNs,
-so this function can't call xmlStringLenDecodeEntities to decode the
-entities.
----
- xmlschemas.c | 30 +++++++++++++++++++++++++-----
- 1 file changed, 25 insertions(+), 5 deletions(-)
-
-diff --git a/xmlschemas.c b/xmlschemas.c
-index e1b3a4f..59535e5 100644
---- a/xmlschemas.c
-+++ b/xmlschemas.c
-@@ -27391,6 +27391,7 @@ xmlSchemaSAXHandleStartElementNs(void *ctx,
- * attributes yet.
- */
- if (nb_attributes != 0) {
-+ int valueLen, k, l;
- xmlChar *value;
-
- for (j = 0, i = 0; i < nb_attributes; i++, j += 5) {
-@@ -27400,12 +27401,31 @@ xmlSchemaSAXHandleStartElementNs(void *ctx,
- * libxml2 differs from normal SAX here in that it escapes all ampersands
- * as &#38; instead of delivering the raw converted string. Changing the
- * behavior at this point would break applications that use this API, so
-- * we are forced to work around it. There is no danger of accidentally
-- * decoding some entity other than &#38; in this step because without
-- * unescaped ampersands there can be no other entities in the string.
-+ * we are forced to work around it.
- */
-- value = xmlStringLenDecodeEntities(vctxt->parserCtxt, attributes[j+3],
-- attributes[j+4] - attributes[j+3], XML_SUBSTITUTE_REF, 0, 0, 0);
-+ valueLen = attributes[j+4] - attributes[j+3];
-+ value = xmlMallocAtomic(valueLen + 1);
-+ if (value == NULL) {
-+ xmlSchemaVErrMemory(vctxt,
-+ "allocating string for decoded attribute",
-+ NULL);
-+ goto internal_error;
-+ }
-+ for (k = 0, l = 0; k < valueLen; l++) {
-+ if (k < valueLen - 4 &&
-+ attributes[j+3][k+0] == '&' &&
-+ attributes[j+3][k+1] == '#' &&
-+ attributes[j+3][k+2] == '3' &&
-+ attributes[j+3][k+3] == '8' &&
-+ attributes[j+3][k+4] == ';') {
-+ value[l] = '&';
-+ k += 5;
-+ } else {
-+ value[l] = attributes[j+3][k];
-+ k++;
-+ }
-+ }
-+ value[l] = '\0';
- /*
- * TODO: Set the node line.
- */
---
-2.8.3
-
-