summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-27 13:35:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-27 14:45:02 +0100
commit90dc4e38928fffc3ed5fcbed40109712eb97e203 (patch)
tree757a463b9c5c231354bd961f282d477ddcd59ace /sd
parenteea399ddd52a0de368321963bb828bc15632dd0b (diff)
avoid hang in certain ppts
Change-Id: Iedba71b72fc815b274ca5e0da0903a558947cb06
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/unit/data/ppt/pass/hang-5.pptbin0 -> 7712 bytes
-rw-r--r--sd/source/filter/ppt/pptin.cxx2
2 files changed, 1 insertions, 1 deletions
diff --git a/sd/qa/unit/data/ppt/pass/hang-5.ppt b/sd/qa/unit/data/ppt/pass/hang-5.ppt
new file mode 100644
index 000000000000..cfaa8f4c601c
--- /dev/null
+++ b/sd/qa/unit/data/ppt/pass/hang-5.ppt
Binary files differ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index abc8fc3ebfaa..8c2d75d04adb 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2557,7 +2557,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
DffRecordHeader& rHdClientData = *maShapeRecords.Current();
while( true )
{
- sal_uInt32 nClientDataLen = rHdClientData.GetRecEndFilePos();
+ sal_uInt32 nClientDataLen = SanitizeEndPos(rSt, rHdClientData.GetRecEndFilePos());
DffRecordHeader aHd;
do
{