From 2cd576c3bbcbabda4b6fa1758ae35cdcfb4bb1c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 26 Sep 2017 13:13:09 +0100 Subject: [PATCH] ofz timeouts in pptfuzzer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id682c1078359db2e2883b71977efedc79235017c Reviewed-on: https://gerrit.libreoffice.org/42805 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- filter/source/msfilter/svdfppt.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 2bbadab82d74..eef6e62f9ed1 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1368,7 +1368,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O while( nCurrentEditAtomStrmPos ) { sal_uInt32 nPersistIncPos = aCurrentEditAtom.nOffsetPersistDirectory; - if (nPersistIncPos && rStCtrl.Seek(nPersistIncPos) == nPersistIncPos) + if (nPersistIncPos && checkSeek(rStCtrl, nPersistIncPos)) { DffRecordHeader aPersistHd; ReadDffRecordHeader( rStCtrl, aPersistHd ); @@ -1407,9 +1407,8 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O } } nCurrentEditAtomStrmPos = aCurrentEditAtom.nOffsetLastEdit < nCurrentEditAtomStrmPos ? aCurrentEditAtom.nOffsetLastEdit : 0; - if ( nCurrentEditAtomStrmPos ) + if (nCurrentEditAtomStrmPos && checkSeek(rStCtrl, nCurrentEditAtomStrmPos)) { - rStCtrl.Seek( nCurrentEditAtomStrmPos ); ReadPptUserEditAtom( rStCtrl, aCurrentEditAtom ); } }