[trunk] -> [extra] 'raptor-2.0.15-21' add
packagesR/raptor/pipeline/head This commit looks good
Details
packagesR/raptor/pipeline/head This commit looks good
Details
parent
8e61790953
commit
b574017f56
GPG Key ID:
DC5A6F8092641E2D
@ -0,0 +1,37 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
=ioV9
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@ -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 a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
|
||||
index 693b94686..0d3a36a5a 100644
|
||||
--- a/src/raptor_xml_writer.c
|
||||
+++ b/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);
|
||||
@ -0,0 +1,37 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
=ioV9
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@ -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 a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
|
||||
index 693b94686..0d3a36a5a 100644
|
||||
--- a/src/raptor_xml_writer.c
|
||||
+++ b/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);
|
||||
Loading…
Reference in new issue