1From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
2From: Dave Beckett <dave@dajobe.org>
3Date: Sun, 16 Apr 2017 23:15:12 +0100
4Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer
5
6(raptor_xml_writer_start_element_common): Calculate max including for
7each attribute a potential name and value.
8
9Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617
10and #0000618 http://bugs.librdf.org/mantis/view.php?id=618
11
12[Peter: fixes CVE-2017-18926, upstream:
13 https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f]
14Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
15---
16 src/raptor_xml_writer.c | 7 ++++---
17 1 file changed, 4 insertions(+), 3 deletions(-)
18
19diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
20index 693b9468..0d3a36a5 100644
21--- a/src/raptor_xml_writer.c
22+++ b/src/raptor_xml_writer.c
23@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
24   size_t nspace_declarations_count = 0;
25   unsigned int i;
26
27-  /* max is 1 per element and 1 for each attribute + size of declared */
28   if(nstack) {
29-    int nspace_max_count = element->attribute_count+1;
30+    int nspace_max_count = element->attribute_count * 2; /* attr and value */
31+    if(element->name->nspace)
32+      nspace_max_count++;
33     if(element->declared_nspaces)
34       nspace_max_count += raptor_sequence_size(element->declared_nspaces);
35     if(element->xml_language)
36@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
37         }
38       }
39
40-      /* Add the attribute + value */
41+      /* Add the attribute's value */
42       nspace_declarations[nspace_declarations_count].declaration=
43         raptor_qname_format_as_xml(element->attributes[i],
44                                    &nspace_declarations[nspace_declarations_count].length);
45--
462.20.1
47
48