Control: tags 973889 + patch Control: tags 973889 + pending Dear maintainer,
I've prepared an NMU for raptor2 (versioned as 2.0.14-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards, Salvatore
diff -Nru raptor2-2.0.14/debian/changelog raptor2-2.0.14/debian/changelog --- raptor2-2.0.14/debian/changelog 2014-05-05 20:15:34.000000000 +0200 +++ raptor2-2.0.14/debian/changelog 2020-11-06 22:08:54.000000000 +0100 @@ -1,3 +1,11 @@ +raptor2 (2.0.14-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Calcualte max nspace declarations correctly for XML writer + (CVE-2017-18926) (Closes: #973889) + + -- Salvatore Bonaccorso <car...@debian.org> Fri, 06 Nov 2020 22:08:54 +0100 + raptor2 (2.0.14-1) unstable; urgency=medium * New upstream release diff -Nru raptor2-2.0.14/debian/patches/Calcualte-max-nspace-declarations-correctly-for-XML-.patch raptor2-2.0.14/debian/patches/Calcualte-max-nspace-declarations-correctly-for-XML-.patch --- raptor2-2.0.14/debian/patches/Calcualte-max-nspace-declarations-correctly-for-XML-.patch 1970-01-01 01:00:00.000000000 +0100 +++ raptor2-2.0.14/debian/patches/Calcualte-max-nspace-declarations-correctly-for-XML-.patch 2020-11-06 22:08:54.000000000 +0100 @@ -0,0 +1,45 @@ +From: Dave Beckett <d...@dajobe.org> +Date: Sun, 16 Apr 2017 23:15:12 +0100 +Subject: Calcualte max nspace declarations correctly for XML writer +Origin: https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f +Bug-Debian: https://bugs.debian.org/973889 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-18926 + +(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 693b946863e6..0d3a36a5a21c 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); +-- +2.29.1 + diff -Nru raptor2-2.0.14/debian/patches/series raptor2-2.0.14/debian/patches/series --- raptor2-2.0.14/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ raptor2-2.0.14/debian/patches/series 2020-11-06 22:08:54.000000000 +0100 @@ -0,0 +1 @@ +Calcualte-max-nspace-declarations-correctly-for-XML-.patch
signature.asc
Description: PGP signature
