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 src/raptor_xml_writer.c | 7 ++++---
13 1 file changed, 4 insertions(+), 3 deletions(-)
14
15diff --git misc/raptor2-2.0.15/src/raptor_xml_writer.c misc/build/raptor2-2.0.15/src/raptor_xml_writer.c
16index 693b9468..0d3a36a5 100644
17--- misc/raptor2-2.0.15/src/raptor_xml_writer.c
18+++ misc/build/raptor2-2.0.15/src/raptor_xml_writer.c
19@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
20   size_t nspace_declarations_count = 0;
21   unsigned int i;
22
23-  /* max is 1 per element and 1 for each attribute + size of declared */
24   if(nstack) {
25-    int nspace_max_count = element->attribute_count+1;
26+    int nspace_max_count = element->attribute_count * 2; /* attr and value */
27+    if(element->name->nspace)
28+      nspace_max_count++;
29     if(element->declared_nspaces)
30       nspace_max_count += raptor_sequence_size(element->declared_nspaces);
31     if(element->xml_language)
32@@ -216,6 +216,9 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
33
34   if(nstack && element->attributes) {
35     for(i = 0; i < element->attribute_count; i++) {
36+      if (nspace_declarations_count > element->attribute_count)
37+        goto error;
38+
39       /* qname */
40       if(element->attributes[i]->nspace) {
41         /* Check if we need a namespace declaration attribute */
42@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
43         }
44       }
45
46-      /* Add the attribute + value */
47+      /* Add the attribute's value */
48       nspace_declarations[nspace_declarations_count].declaration=
49         raptor_qname_format_as_xml(element->attributes[i],
50                                    &nspace_declarations[nspace_declarations_count].length);
51