summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-21 13:26:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-21 13:30:26 +0100
commit0030efe09ad9447933ac3b1875c270ed1649aee7 (patch)
treec5cb25224c51ef1ec208ba594ecb2308aa4fa594 /sw
parent6405203750f7f779a3655bc5f415e8e0a2071d1b (diff)
don't crash due to earlier short reads
Change-Id: I682a9bf72cbe18999c0c5acc495e813727e0e372
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/core/data/ww6/pass/crash-4.docbin0 -> 6611 bytes
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx3
2 files changed, 3 insertions, 0 deletions
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 000000000000..5abaecc2b3c0
--- /dev/null
+++ b/sw/qa/core/data/ww6/pass/crash-4.doc
Binary files differ
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 5a8072c4214d..442c52735560 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)