Gentoo-bug: 630682 (CVE-2017-14226) Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1 Reviewed-on: https://gerrit.libreoffice.org/42054 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- a/src/lib/WP5StylesListener.cpp +++ b/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::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); - HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) + std::vector headerFooterList = m_nextPage.getHeaderFooterList(); + for (std::vector::const_iterator HFiter = headerFooterList.begin(); + HFiter != headerFooterList.end(); ++HFiter) { if ((*HFiter).getOccurrence() != NEVER) { --- a/src/lib/WP42StylesListener.cpp +++ b/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::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); - HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) + std::vector headerFooterList = m_nextPage.getHeaderFooterList(); + for (std::vector::const_iterator HFiter = headerFooterList.begin(); + HFiter != headerFooterList.end(); ++HFiter) { if ((*HFiter).getOccurrence() != NEVER) { --- a/src/lib/WP1StylesListener.cpp +++ b/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::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); - HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) + std::vector headerFooterList = m_nextPage.getHeaderFooterList(); + for (std::vector::const_iterator HFiter = headerFooterList.begin(); + HFiter != headerFooterList.end(); ++HFiter) { if ((*HFiter).getOccurrence() != NEVER) {