summaryrefslogtreecommitdiff
path: root/sd/source
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 15:11:40 +0200
commit02b3e68ad33e49c0c7abc0840a30f3ce2cc74aaf (patch)
tree7111abfc8ca0534573d2f793554c149c66830f1d /sd/source
parent9e3d59364beee9b82d2e67bdfce0311240a74fab (diff)
don't hang on unreachable record ends
Change-Id: I288f7ff0327831603eda6e827c8acbae678dfaff (cherry picked from commit cadac8400a018c8c566379f7767ea5edff78523d) Reviewed-on: https://gerrit.libreoffice.org/18017 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sd/source')
-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 8b1eee62063b..d475eb277a69 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -814,7 +814,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 );