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