[Libreoffice-commits] core.git: filter/source sd/source
Caolán McNamara
caolanm at redhat.com
Sun Nov 26 21:10:17 UTC 2017
filter/source/msfilter/msdffimp.cxx | 5 ++++-
sd/source/filter/ppt/pptin.cxx | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f35a63deeb85a93f082eaebbfc6f1130d8729275
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Nov 26 20:45:10 2017 +0000
ofz#4436 check if seek succeeded
Change-Id: I56d9692647b28c706b56ccacf08d494b3d830d94
Reviewed-on: https://gerrit.libreoffice.org/45294
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9c3a8f6a10ee..c2f77d7beb2b 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6039,7 +6039,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 60eb678303b0..4215cd7b60a8 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -857,7 +857,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;
}
}
More information about the Libreoffice-commits
mailing list