11d5f25b3SDon LewisFrom 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001 21d5f25b3SDon LewisFrom: Dave Beckett <dave@dajobe.org> 31d5f25b3SDon LewisDate: Sun, 16 Apr 2017 23:15:12 +0100 41d5f25b3SDon LewisSubject: [PATCH] Calcualte max nspace declarations correctly for XML writer 51d5f25b3SDon Lewis 61d5f25b3SDon Lewis(raptor_xml_writer_start_element_common): Calculate max including for 71d5f25b3SDon Lewiseach attribute a potential name and value. 81d5f25b3SDon Lewis 91d5f25b3SDon LewisFixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617 101d5f25b3SDon Lewisand #0000618 http://bugs.librdf.org/mantis/view.php?id=618 111d5f25b3SDon Lewis--- 121d5f25b3SDon Lewis src/raptor_xml_writer.c | 7 ++++--- 131d5f25b3SDon Lewis 1 file changed, 4 insertions(+), 3 deletions(-) 141d5f25b3SDon Lewis 151d5f25b3SDon Lewisdiff --git misc/raptor2-2.0.15/src/raptor_xml_writer.c misc/build/raptor2-2.0.15/src/raptor_xml_writer.c 161d5f25b3SDon Lewisindex 693b9468..0d3a36a5 100644 171d5f25b3SDon Lewis--- misc/raptor2-2.0.15/src/raptor_xml_writer.c 181d5f25b3SDon Lewis+++ misc/build/raptor2-2.0.15/src/raptor_xml_writer.c 191d5f25b3SDon Lewis@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, 201d5f25b3SDon Lewis size_t nspace_declarations_count = 0; 211d5f25b3SDon Lewis unsigned int i; 221d5f25b3SDon Lewis 231d5f25b3SDon Lewis- /* max is 1 per element and 1 for each attribute + size of declared */ 241d5f25b3SDon Lewis if(nstack) { 251d5f25b3SDon Lewis- int nspace_max_count = element->attribute_count+1; 261d5f25b3SDon Lewis+ int nspace_max_count = element->attribute_count * 2; /* attr and value */ 271d5f25b3SDon Lewis+ if(element->name->nspace) 281d5f25b3SDon Lewis+ nspace_max_count++; 291d5f25b3SDon Lewis if(element->declared_nspaces) 301d5f25b3SDon Lewis nspace_max_count += raptor_sequence_size(element->declared_nspaces); 311d5f25b3SDon Lewis if(element->xml_language) 32*f29d6dacSJim Jagielski@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, 3314bde5daSJim Jagielski 34*f29d6dacSJim Jagielski /* check it wasn't an earlier declaration too */ 35*f29d6dacSJim Jagielski for(j = 0; j < nspace_declarations_count; j++) 36*f29d6dacSJim Jagielski- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { 37*f29d6dacSJim Jagielski+ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { 38*f29d6dacSJim Jagielski declare_me = 0; 39*f29d6dacSJim Jagielski break; 40*f29d6dacSJim Jagielski } 411d5f25b3SDon Lewis@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, 421d5f25b3SDon Lewis } 431d5f25b3SDon Lewis } 441d5f25b3SDon Lewis 451d5f25b3SDon Lewis- /* Add the attribute + value */ 461d5f25b3SDon Lewis+ /* Add the attribute's value */ 471d5f25b3SDon Lewis nspace_declarations[nspace_declarations_count].declaration= 481d5f25b3SDon Lewis raptor_qname_format_as_xml(element->attributes[i], 491d5f25b3SDon Lewis &nspace_declarations[nspace_declarations_count].length); 50