rpms/raptor2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import raptor2-2.0.15-15.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-11-19 20:10:27 +00:00 committed by Andrew Lukoshko
parent 804832762c
commit 079717836f
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
SOURCES/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch Normal file
View File

@ -0,0 +1,43 @@
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 693b946..0d3a36a 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.9.3

13
SPECS/raptor2.spec
View File

@ -2,13 +2,15 @@
Summary: RDF Parser Toolkit for Redland
Name: raptor2
Version: 2.0.15
Release: 14%{?dist}
Release: 15%{?dist}
License: GPLv2+ or LGPLv2+ or ASL 2.0
Source: http://download.librdf.org/source/raptor2-%{version}.tar.gz
URL: http://librdf.org/raptor/
## upstreamable patches
## upstream patches
# https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f
Patch1: 0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch
BuildRequires: curl-devel
%if ! 0%{?flatpak}
@ -33,7 +35,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q
%autosetup -p1
# hack to nuke rpaths
%if "%{_libdir}" != "/usr/lib"
@ -94,7 +96,10 @@ rm -rf %{buildroot}
%changelog
* Mon Nov 15 2020 Caolán McNamara <caolanm@redhat.com> - 2.0.15-14
* Tue Nov 17 2020 Caolán McNamara <caolanm@redhat.com> - 2.0.15-15
- Resolves: rhbz#1896534 CVE-2017-18926 raptor: heap-based buffer overflow
* Mon Nov 16 2020 Caolán McNamara <caolanm@redhat.com> - 2.0.15-14
- Resolves: rhbz#1896340 Suppress documentation in Flatpak builds
* Tue Aug 21 2018 Caolán McNamara <caolanm@redhat.com> - 2.0.15-13