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