openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From truck...@apache.org
Subject [openoffice] branch trunk updated: Calculate max nspace declarations correctly for XML writer
Date Wed, 11 Nov 2020 07:12:52 GMT
This is an automated email from the ASF dual-hosted git repository.

truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 1d5f25b  Calculate max nspace declarations correctly for XML writer
1d5f25b is described below

commit 1d5f25b3a6d735ba43bcd728fa141b3a24bbcb5d
Author: Don Lewis <truckman@apache.org>
AuthorDate: Tue Nov 10 22:43:34 2020 -0800

    Calculate max nspace declarations correctly for XML writer
    
    Patch by: Dave Beckett <dave@dajobe.org> (via raptor project git repository)
    https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch
---
 main/redland/raptor/makefile.mk                 |  1 +
 main/redland/raptor/raptor2-2.0.15.patch.nspace | 40 +++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/main/redland/raptor/makefile.mk b/main/redland/raptor/makefile.mk
index 0c8b6a4..acb8bfa 100644
--- a/main/redland/raptor/makefile.mk
+++ b/main/redland/raptor/makefile.mk
@@ -48,6 +48,7 @@ TARFILE_MD5=a39f6c07ddb20d7dd2ff1f95fa21e2cd
 ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h
 
 OOO_PATCH_FILES= \
+    $(TARFILE_NAME).patch.nspace \
     $(TARFILE_NAME).patch.dmake \
 
 PATCH_FILES=$(OOO_PATCH_FILES)
diff --git a/main/redland/raptor/raptor2-2.0.15.patch.nspace b/main/redland/raptor/raptor2-2.0.15.patch.nspace
new file mode 100644
index 0000000..8e07f2d
--- /dev/null
+++ b/main/redland/raptor/raptor2-2.0.15.patch.nspace
@@ -0,0 +1,40 @@
+From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001
+From: Dave Beckett <dave@dajobe.org>
+Date: Sun, 16 Apr 2017 23:15:12 +0100
+Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer
+
+(raptor_xml_writer_start_element_common): Calculate max including for
+each attribute a potential name and value.
+
+Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617
+and #0000618 http://bugs.librdf.org/mantis/view.php?id=618
+---
+ src/raptor_xml_writer.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git misc/raptor2-2.0.15/src/raptor_xml_writer.c misc/build/raptor2-2.0.15/src/raptor_xml_writer.c
+index 693b9468..0d3a36a5 100644
+--- misc/raptor2-2.0.15/src/raptor_xml_writer.c
++++ misc/build/raptor2-2.0.15/src/raptor_xml_writer.c
+@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+   size_t nspace_declarations_count = 0;  
+   unsigned int i;
+ 
+-  /* max is 1 per element and 1 for each attribute + size of declared */
+   if(nstack) {
+-    int nspace_max_count = element->attribute_count+1;
++    int nspace_max_count = element->attribute_count * 2; /* attr and value */
++    if(element->name->nspace)
++      nspace_max_count++;
+     if(element->declared_nspaces)
+       nspace_max_count += raptor_sequence_size(element->declared_nspaces);
+     if(element->xml_language)
+@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+         }
+       }
+ 
+-      /* Add the attribute + value */
++      /* Add the attribute's value */
+       nspace_declarations[nspace_declarations_count].declaration=
+         raptor_qname_format_as_xml(element->attributes[i],
+                                    &nspace_declarations[nspace_declarations_count].length);


Mime
View raw message