filter/source/msfilter/msdffimp.cxx | 5 ++++- sd/source/filter/ppt/pptin.cxx | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 765ff606426251f90aff5d1fc89f01ed7594ed59 Author: Caolán McNamara <[email protected]> Date: Sun Nov 26 20:45:10 2017 +0000 ofz#4436 check if seek succeeded Change-Id: I56d9692647b28c706b56ccacf08d494b3d830d94 Reviewed-on: https://gerrit.libreoffice.org/45296 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index e6acd585ab5e..443feb8ea728 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6026,7 +6026,10 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt, return false; } else - rSt.SeekRel( nLength ); + { + if (!checkSeek(rSt, rSt.Tell() + nLength)) + return false; + } nReadSpGrCont += nLength; } while( nReadSpGrCont < nLenShapeGroupCont ); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 738e865cb23a..6d0551ac01c9 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -855,7 +855,7 @@ bool ImplSdPPTImport::Import() bool bSuccess = aHd.SeekToEndOfRecord(rStCtrl); if (!bSuccess) { - SAL_WARN("filter.ms", "Count not seek to end of record"); + SAL_WARN("filter.ms", "Could not seek to end of record"); break; } }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
