[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa sw/source

[Caolán McNamara]

 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 25330c39e5f80b3039f753d35b3e3546279fd5f2
Author: Caolán McNamara <caolanm at 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/17909
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at 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 83b6490..03bada1 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4382,6 +4382,9 @@ void WW8RStyle::ImportOldFormatStyles()
         if (eSti == ww::stiNil)
             continue;
 
+        if (stcp >= aPAPXOffsets.size())
+            continue;
+
         rSI.bValid = true;
 
         if (ww::StandardStiIsCharStyle(eSti) && !aPAPXOffsets[stcp].mnSize)