You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2021/02/04 16:41:15 UTC

[openoffice] branch AOO42X updated: https://bugs.librdf.org/mantis/view.php?id=650

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 4d7381f  https://bugs.librdf.org/mantis/view.php?id=650
4d7381f is described below

commit 4d7381f6cd8d5f1c8c107c479c90962f6dabf5a0
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Thu Feb 4 11:40:08 2021 -0500

    https://bugs.librdf.org/mantis/view.php?id=650
    
    (cherry picked from commit f29d6dac0ccd6b159a0eba79f3fa6650a5151b81)
---
 main/redland/raptor/raptor2-2.0.15.patch.nspace | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/main/redland/raptor/raptor2-2.0.15.patch.nspace b/main/redland/raptor/raptor2-2.0.15.patch.nspace
index b3363e6..5fb9645 100644
--- a/main/redland/raptor/raptor2-2.0.15.patch.nspace
+++ b/main/redland/raptor/raptor2-2.0.15.patch.nspace
@@ -29,16 +29,15 @@ index 693b9468..0d3a36a5 100644
      if(element->declared_nspaces)
        nspace_max_count += raptor_sequence_size(element->declared_nspaces);
      if(element->xml_language)
-@@ -216,6 +216,9 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
- 
-   if(nstack && element->attributes) {
-     for(i = 0; i < element->attribute_count; i++) {
-+      if (nspace_declarations_count > element->attribute_count)
-+        goto error;
-+
-       /* qname */
-       if(element->attributes[i]->nspace) {
-         /* Check if we need a namespace declaration attribute */
+@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
+           
+           /* check it wasn't an earlier declaration too */
+           for(j = 0; j < nspace_declarations_count; j++)
+-            if(nspace_declarations[j].nspace == element->attributes[j]->nspace) {
++            if(nspace_declarations[j].nspace == element->attributes[i]->nspace) {
+               declare_me = 0;
+               break;
+             }
 @@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
          }
        }