sw/qa/core/data/ww6/pass/crash-4.doc |binary
sw/source/filter/ww8/ww8par2.cxx | 3 +++
2 files changed, 3 insertions(+)
New commits:
commit 319d725c73b8bf60158961aa0b014258708effab
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Aug 21 13:26:44 2015 +0100
don't crash due to earlier short reads
Change-Id: I682a9bf72cbe18999c0c5acc495e813727e0e372
(cherry picked from commit 0030efe09ad9447933ac3b1875c270ed1649aee7)
Reviewed-on: https://gerrit.libreoffice.org/17903
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/sw/qa/core/data/ww6/pass/crash-4.doc
b/sw/qa/core/data/ww6/pass/crash-4.doc
new file mode 100644
index 0000000..5abaecc
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-4.doc differ
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 16273ed..f214746 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4380,6 +4380,9 @@ void WW8RStyle::ImportOldFormatStyles()
if (eSti == ww::stiNil)
continue;
+ if (stcp >= aPAPXOffsets.size())
+ continue;
+
rSI.bValid = true;
if (ww::StandardStiIsCharStyle(eSti) && !aPAPXOffsets[stcp].mnSize)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
