[libwpd] 01/01: backport patch to fix CVE-2017-14226 (closes: #876001)

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch jessie
in repository libwpd.

commit 77083f709f07492309bc8d0fe4922210414461ee
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Sep 17 13:22:19 2017 +0200

    backport patch to fix CVE-2017-14226 (closes: #876001)
---
 debian/changelog                     |  7 ++++++
 debian/patches/libwpd-tdf112269.diff | 43 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7b37add..743ed0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libwpd (0.10.0-2+deb8u1) jessie; urgency=medium
+
+  * debian/patches/libwpd-tdf112269.diff: backport patch to fix
+    CVE-2017-14226 (closes: #876001)
+
+ -- Rene Engelhard <rene at debian.org>  Sun, 17 Sep 2017 13:20:30 +0200
+
 libwpd (0.10.0-2) unstable; urgency=low
 
   * upload to unstable
diff --git a/debian/patches/libwpd-tdf112269.diff b/debian/patches/libwpd-tdf112269.diff
new file mode 100644
index 0000000..605ccb3
--- /dev/null
+++ b/debian/patches/libwpd-tdf112269.diff
@@ -0,0 +1,43 @@
+--- 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/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2bd695a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libwpd-tdf112269.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libwpd.git