diff options
Diffstat (limited to 'dev-libs/libxml2/files/libxml2-2.9.4-osd-validation.patch')
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.4-osd-validation.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/dev-libs/libxml2/files/libxml2-2.9.4-osd-validation.patch b/dev-libs/libxml2/files/libxml2-2.9.4-osd-validation.patch deleted file mode 100644 index 9d1a03346f6..00000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.4-osd-validation.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 8bc6baccc7da291c2338b8d95953ea487b0b3ca1 Mon Sep 17 00:00:00 2001 -From: Alex Henrie <alexhenrie24@gmail.com> -Date: Thu, 26 May 2016 17:38:35 -0600 -Subject: [PATCH 2/7] 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 e1b3a4f0..59535e5c 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 & 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 & 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.14.1 - |