1*b1cdbd2cSJim JagielskiFrom 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
2*b1cdbd2cSJim JagielskiFrom: Dave Beckett <dave@dajobe.org>
3*b1cdbd2cSJim JagielskiDate: Sun, 16 Apr 2017 23:15:12 +0100
4*b1cdbd2cSJim JagielskiSubject: [PATCH] Calcualte max nspace declarations correctly for XML writer
5*b1cdbd2cSJim Jagielski
6*b1cdbd2cSJim Jagielski(raptor_xml_writer_start_element_common): Calculate max including for
7*b1cdbd2cSJim Jagielskieach attribute a potential name and value.
8*b1cdbd2cSJim Jagielski
9*b1cdbd2cSJim JagielskiFixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617
10*b1cdbd2cSJim Jagielskiand #0000618 http://bugs.librdf.org/mantis/view.php?id=618
11*b1cdbd2cSJim Jagielski---
12*b1cdbd2cSJim Jagielski src/raptor_xml_writer.c | 7 ++++---
13*b1cdbd2cSJim Jagielski 1 file changed, 4 insertions(+), 3 deletions(-)
14*b1cdbd2cSJim Jagielski
15*b1cdbd2cSJim Jagielskidiff --git misc/raptor2-2.0.15/src/raptor_xml_writer.c misc/build/raptor2-2.0.15/src/raptor_xml_writer.c
16*b1cdbd2cSJim Jagielskiindex 693b9468..0d3a36a5 100644
17*b1cdbd2cSJim Jagielski--- misc/raptor2-2.0.15/src/raptor_xml_writer.c
18*b1cdbd2cSJim Jagielski+++ misc/build/raptor2-2.0.15/src/raptor_xml_writer.c
19*b1cdbd2cSJim Jagielski@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
20*b1cdbd2cSJim Jagielski   size_t nspace_declarations_count = 0;
21*b1cdbd2cSJim Jagielski   unsigned int i;
22*b1cdbd2cSJim Jagielski
23*b1cdbd2cSJim Jagielski-  /* max is 1 per element and 1 for each attribute + size of declared */
24*b1cdbd2cSJim Jagielski   if(nstack) {
25*b1cdbd2cSJim Jagielski-    int nspace_max_count = element->attribute_count+1;
26*b1cdbd2cSJim Jagielski+    int nspace_max_count = element->attribute_count * 2; /* attr and value */
27*b1cdbd2cSJim Jagielski+    if(element->name->nspace)
28*b1cdbd2cSJim Jagielski+      nspace_max_count++;
29*b1cdbd2cSJim Jagielski     if(element->declared_nspaces)
30*b1cdbd2cSJim Jagielski       nspace_max_count += raptor_sequence_size(element->declared_nspaces);
31*b1cdbd2cSJim Jagielski     if(element->xml_language)
32*b1cdbd2cSJim Jagielski@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
33*b1cdbd2cSJim Jagielski         }
34*b1cdbd2cSJim Jagielski       }
35*b1cdbd2cSJim Jagielski
36*b1cdbd2cSJim Jagielski-      /* Add the attribute + value */
37*b1cdbd2cSJim Jagielski+      /* Add the attribute's value */
38*b1cdbd2cSJim Jagielski       nspace_declarations[nspace_declarations_count].declaration=
39*b1cdbd2cSJim Jagielski         raptor_qname_format_as_xml(element->attributes[i],
40*b1cdbd2cSJim Jagielski                                    &nspace_declarations[nspace_declarations_count].length);
41