summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Gurr Timo <tgurr@exherbo.org> 2017-09-12 18:01:44 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-09-12 18:24:11 +0200
commit32fc79b9c025b4f7fa9376939e688c1046254476 (patch)
tree472857b0db8c718e817cc6eddc129badae5999d7
parent87e546fb379794678e5a44c39c948e4c421211d9 (diff)
downloadoffice-32fc79b9c025b4f7fa9376939e688c1046254476.tar.gz
office-32fc79b9c025b4f7fa9376939e688c1046254476.tar.xz
libwpd: add upstream patch fixing CVE-2017-14226
Change-Id: I380d2e9a2a0a3b3a468267cec5337872ec05945c Reviewed-on: https://galileo.mailstation.de/gerrit/10044 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--metadata/repository_mask.conf7
-rw-r--r--packages/office-libs/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch46
-rw-r--r--packages/office-libs/libwpd/libwpd-0.10.1-r1.exheres-0 (renamed from packages/office-libs/libwpd/libwpd-0.10.1.exheres-0)4
3 files changed, 57 insertions, 0 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 2eb2cb8..9d2ee8c 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -18,3 +18,10 @@ office-libs/libmwaw[<0.3.11] [[
token = security
description = [ CVE-2017-9433 ]
]]
+
+office-libs/libwpd[<0.10.1-r1] [[
+ author = [ Timo Gurr <tgurr@exherbo.org> ]
+ date = [ 12 Sep 2017 ]
+ token = security
+ description = [ CVE-2017-14226 ]
+]]
diff --git a/packages/office-libs/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch b/packages/office-libs/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
new file mode 100644
index 0000000..aacedb0
--- /dev/null
+++ b/packages/office-libs/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
@@ -0,0 +1,46 @@
+Source: https://gerrit.libreoffice.org/#/c/42054/
+Upstream: Fixed in git master
+Reason: CVE-2017-14226
+
+--- libwpd/src/lib/WP5StylesListener.cpp
++++ libwpd/src/lib/WP5StylesListener.cpp
+@@ -85,8 +85,9 @@
+ m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
+ m_currentPage.setPageSpan(1);
+
+- for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
+- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
++ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
++ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
++ HFiter != headerFooterList.end(); ++HFiter)
+ {
+ if ((*HFiter).getOccurrence() != NEVER)
+ {
+--- libwpd/src/lib/WP42StylesListener.cpp
++++ libwpd/src/lib/WP42StylesListener.cpp
+@@ -84,8 +84,9 @@
+ m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
+ m_currentPage.setPageSpan(1);
+
+- for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
+- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
++ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
++ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
++ HFiter != headerFooterList.end(); ++HFiter)
+ {
+ if ((*HFiter).getOccurrence() != NEVER)
+ {
+--- libwpd/src/lib/WP1StylesListener.cpp
++++ libwpd/src/lib/WP1StylesListener.cpp
+@@ -83,8 +83,9 @@
+ m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
+ m_currentPage.setPageSpan(1);
+
+- for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
+- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
++ std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
++ for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
++ HFiter != headerFooterList.end(); ++HFiter)
+ {
+ if ((*HFiter).getOccurrence() != NEVER)
+ {
diff --git a/packages/office-libs/libwpd/libwpd-0.10.1.exheres-0 b/packages/office-libs/libwpd/libwpd-0.10.1-r1.exheres-0
index d41764a..22481d9 100644
--- a/packages/office-libs/libwpd/libwpd-0.10.1.exheres-0
+++ b/packages/office-libs/libwpd/libwpd-0.10.1-r1.exheres-0
@@ -28,6 +28,10 @@ DEPENDENCIES="
office-libs/librevenge[>=0.0.1]
"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PN}-0.10.1-CVE-2017-14226.patch
+)
+
DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-tools
--disable-werror