[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - external/libmwaw

[David Tardon]

 external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 |   25 ++++++++++
 external/libmwaw/UnpackedTarball_libmwaw.mk                    |    1 
 2 files changed, 26 insertions(+)

New commits:
commit 54e7b46718bf2f47c7f55a93cfbb23681429ffc6
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jun 15 13:17:40 2017 +0200

    use correct size
    
    (cherry picked from commit d1ae31a1fc49ec7a68b2a07c5e5e97d95b346ca9)
    
    Change-Id: I620ada9b209bb2084eccaa81385beb6306d6a3d0
    Reviewed-on: https://gerrit.libreoffice.org/38827
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 b/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1
new file mode 100644
index 000000000000..df64f7bcf4d2
--- /dev/null
+++ b/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1
@@ -0,0 +1,25 @@
+From 68b3b74569881248bfb6cbb4266177cc253b292f Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at 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.0
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 17c3ec5f82c2..6803ee09d06d 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,6 +37,7 @@ endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
 	external/libmwaw/0001-fix-build-with-msvc.patch.1 \
+	external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: