summaryrefslogtreecommitdiff
path: root/sd/source/filter/ppt/pptin.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-26 12:35:01 +0100
committerAndras Timar <andras.timar@collabora.com>2015-08-31 13:53:02 +0200
commit1d9b92c3ef4b7a3a498eadae69ffebf26046e27c (patch)
tree37a9c4a336bb65bf83de07ccb34fb1986c16ce7d /sd/source/filter/ppt/pptin.cxx
parentd33cd7dc8865d7b8ecda5af6cfe6f94d86cb1c7a (diff)
don't hang on unreachable record ends
Change-Id: I288f7ff0327831603eda6e827c8acbae678dfaff (cherry picked from commit cadac8400a018c8c566379f7767ea5edff78523d) Reviewed-on: https://gerrit.libreoffice.org/18021 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sd/source/filter/ppt/pptin.cxx')
-rw-r--r--sd/source/filter/ppt/pptin.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 64c64bad7ca2..06a89e615bcc 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -813,7 +813,12 @@ bool ImplSdPPTImport::Import()
}
break;
}
- aHd.SeekToEndOfRecord( rStCtrl );
+ bool bSuccess = aHd.SeekToEndOfRecord(rStCtrl);
+ if (!bSuccess)
+ {
+ SAL_WARN("filter.ms", "Count not seek to end of record");
+ break;
+ }
}
}
rStCtrl.Seek( nFPosMerk );