Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/raptor/files/, media-libs/raptor/
Date: Thu, 29 Apr 2021 07:55:59
Message-Id: 1619682949.302b7d40ecbd4d456c0f39046a9c078c96e672d8.fordfrog@gentoo
1 commit: 302b7d40ecbd4d456c0f39046a9c078c96e672d8
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 29 07:55:33 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 29 07:55:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302b7d40
7
8 media-libs/raptor: fixed CVE-2020-25713
9
10 Bug: https://bugs.gentoo.org/754264
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 ...713-raptor2-malformed-input-file-can-lead.patch | 32 ++++++++++++++++++++++
15 ...or-2.0.15-r2.ebuild => raptor-2.0.15-r3.ebuild} | 1 +
16 2 files changed, 33 insertions(+)
17
18 diff --git a/media-libs/raptor/files/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch b/media-libs/raptor/files/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch
19 new file mode 100644
20 index 00000000000..dc693dfec22
21 --- /dev/null
22 +++ b/media-libs/raptor/files/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch
23 @@ -0,0 +1,32 @@
24 +From a549457461874157c8c8e8e8a6e0eec06da4fbd0 Mon Sep 17 00:00:00 2001
25 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@××××××.com>
26 +Date: Tue, 24 Nov 2020 10:30:20 +0000
27 +Subject: [PATCH] CVE-2020-25713 raptor2: malformed input file can lead to a
28 + segfault
29 +
30 +due to an out of bounds array access in
31 +raptor_xml_writer_start_element_common
32 +
33 +See:
34 +https://bugs.mageia.org/show_bug.cgi?id=27605
35 +https://www.openwall.com/lists/oss-security/2020/11/13/1
36 +https://gerrit.libreoffice.org/c/core/+/106249
37 +---
38 + src/raptor_xml_writer.c | 2 +-
39 + 1 file changed, 1 insertion(+), 1 deletion(-)
40 +
41 +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
42 +index 56993dc3..4426d38c 100644
43 +--- a/src/raptor_xml_writer.c
44 ++++ b/src/raptor_xml_writer.c
45 +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
46 +
47 + /* check it wasn't an earlier declaration too */
48 + for(j = 0; j < nspace_declarations_count; j++)
49 +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) {
50 ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) {
51 + declare_me = 0;
52 + break;
53 + }
54 +--
55 +2.28.0
56
57 diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r3.ebuild
58 similarity index 95%
59 rename from media-libs/raptor/raptor-2.0.15-r2.ebuild
60 rename to media-libs/raptor/raptor-2.0.15-r3.ebuild
61 index e2a831c9984..1f3f7e84c66 100644
62 --- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
63 +++ b/media-libs/raptor/raptor-2.0.15-r3.ebuild
64 @@ -41,6 +41,7 @@ HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
65 PATCHES=(
66 "${FILESDIR}/${P}-heap-overflow.patch"
67 "${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
68 + "${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch"
69 )
70
71 src_prepare() {