From f2e8cc72d4523f91afd998d0b6b258e13406361c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 15 Jul 2017 22:08:12 +0200 Subject: [PATCH] new upstream release 0.3.12 --- .gitignore | 1 + 0001-ofz-1037-resize-vector-correctly.patch | 25 --------------------- libmwaw.spec | 9 ++++---- sources | 2 +- 4 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 0001-ofz-1037-resize-vector-correctly.patch diff --git a/.gitignore b/.gitignore index d8fb4a4..e47086f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /libmwaw-0.3.9.tar.xz /libmwaw-0.3.10.tar.xz /libmwaw-0.3.11.tar.xz +/libmwaw-0.3.12.tar.xz diff --git a/0001-ofz-1037-resize-vector-correctly.patch b/0001-ofz-1037-resize-vector-correctly.patch deleted file mode 100644 index df64f7b..0000000 --- a/0001-ofz-1037-resize-vector-correctly.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 68b3b74569881248bfb6cbb4266177cc253b292f Mon Sep 17 00:00:00 2001 -From: David Tardon -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.0 - diff --git a/libmwaw.spec b/libmwaw.spec index 7826b5f..b0e36bd 100644 --- a/libmwaw.spec +++ b/libmwaw.spec @@ -1,16 +1,14 @@ %global apiversion 0.3 Name: libmwaw -Version: 0.3.11 -Release: 3%{?dist} +Version: 0.3.12 +Release: 1%{?dist} Summary: A library for import of many old Mac document formats License: LGPLv2+ or MPLv2.0 URL: http://sourceforge.net/projects/libmwaw/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz -Patch0: 0001-ofz-1037-resize-vector-correctly.patch - BuildRequires: doxygen BuildRequires: help2man BuildRequires: pkgconfig(librevenge-0.0) @@ -106,6 +104,9 @@ install -m 0644 mwaw2*.1 %{buildroot}/%{_mandir}/man1 %{_mandir}/man1/mwaw2text.1* %changelog +* Sat Jul 15 2017 David Tardon - 0.3.12-1 +- new upstream release + * Thu Jun 15 2017 David Tardon - 0.3.11-3 - Resolves: rhbz#1461763 CVE-2017-9433 Out-of-bounds write in the MsWrd1Parser::readFootnoteCorrespondence function diff --git a/sources b/sources index 51b4e50..4a750c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmwaw-0.3.11.tar.xz) = d4a810c6066023608a15ece8a6bbc958e586d679fc4ad51156091ec88355292872f10198e723e28776b45e140a830fd4c698732cf6103743d6e80ad8e1d778ab +SHA512 (libmwaw-0.3.12.tar.xz) = 8af8477ff6fc251600f9a66059b20fd8b9fad8d599c01e847d7185944447b3a34567036daff4d4510934aa1462bd4810a39467e8ac0ec223147b3b53447220ec