summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-06-21 22:24:36 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-06-21 22:35:34 +0200
commitc809e0f7de990350dca7e7a4d3d6e41c3a2085e0 (patch)
treef7f7d2ca5d7d2deff6435207b972d3d2721f9e0a
parent6ee0cc28f4c2333c72fe11c9604554d994112dc9 (diff)
downloadoffice-c809e0f7de990350dca7e7a4d3d6e41c3a2085e0.tar.gz
office-c809e0f7de990350dca7e7a4d3d6e41c3a2085e0.tar.xz
libmwaw: Version bump to 0.3.11
-rw-r--r--metadata/repository_mask.conf7
-rw-r--r--packages/office-libs/libmwaw/files/libmwaw-0.3.11-ofz-1037-resize-vector-correctly.patch28
-rw-r--r--packages/office-libs/libmwaw/libmwaw-0.3.11.exheres-0 (renamed from packages/office-libs/libmwaw/libmwaw-0.3.10.exheres-0)4
3 files changed, 39 insertions, 0 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 95d0e5c..2eb2cb8 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -11,3 +11,10 @@ app-office/libreoffice[<5.1.4.2] [[
token = security
description = [ CVE-2016-4324 ]
]]
+
+office-libs/libmwaw[<0.3.11] [[
+ author = [ Heiko Becker <heirecka@exherbo.org> ]
+ date = [ 21 Jun 2017 ]
+ token = security
+ description = [ CVE-2017-9433 ]
+]]
diff --git a/packages/office-libs/libmwaw/files/libmwaw-0.3.11-ofz-1037-resize-vector-correctly.patch b/packages/office-libs/libmwaw/files/libmwaw-0.3.11-ofz-1037-resize-vector-correctly.patch
new file mode 100644
index 0000000..38132bb
--- /dev/null
+++ b/packages/office-libs/libmwaw/files/libmwaw-0.3.11-ofz-1037-resize-vector-correctly.patch
@@ -0,0 +1,28 @@
+Upstream: yes
+Reason: CVE-2017-9433
+
+From 68b3b74569881248bfb6cbb4266177cc253b292f Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 8 Apr 2017 14:03:29 +0200
+Subject: [PATCH] ofz#1037 resize vector correctly
+
+---
+ src/lib/MsWrd1Parser.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/MsWrd1Parser.cxx b/src/lib/MsWrd1Parser.cxx
+index 63547e6..3626064 100644
+--- a/src/lib/MsWrd1Parser.cxx
++++ b/src/lib/MsWrd1Parser.cxx
+@@ -902,7 +902,7 @@ bool MsWrd1Parser::readFootnoteCorrespondance(MWAWVec2i limits)
+ int id = fIt++->second;
+ fPos[1] = fIt==footnoteMap.end() ? m_state->m_eot : fIt->first;
+ if (id >= int(m_state->m_footnotesList.size()))
+- m_state->m_footnotesList.resize(size_t(id),MWAWVec2l(0,0));
++ m_state->m_footnotesList.resize(size_t(id)+1,MWAWVec2l(0,0));
+ m_state->m_footnotesList[size_t(id)]=fPos;
+ }
+ ascii().addDelimiter(input->tell(),'|');
+--
+2.13.1
+
diff --git a/packages/office-libs/libmwaw/libmwaw-0.3.10.exheres-0 b/packages/office-libs/libmwaw/libmwaw-0.3.11.exheres-0
index 609cced..8d7aa1a 100644
--- a/packages/office-libs/libmwaw/libmwaw-0.3.10.exheres-0
+++ b/packages/office-libs/libmwaw/libmwaw-0.3.11.exheres-0
@@ -6,3 +6,7 @@ require libmwaw
SLOT="0.3"
PLATFORMS="~amd64 ~x86"
+DEFAULT_SRC_PREPARE_PATCHES+=(
+ "${FILES}"/${PNV}-ofz-1037-resize-vector-correctly.patch
+)
+