summaryrefslogtreecommitdiff
path: root/filter/source/msfilter/msdffimp.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'filter/source/msfilter/msdffimp.cxx')
-rw-r--r--filter/source/msfilter/msdffimp.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index ebe405aefb9d..10a0ca1f6382 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6241,7 +6241,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
// search for the Blip Property!
sal_uLong nPropRead = 0;
nLenShapePropTbl = nLength;
- long nStartShapePropTbl = rSt.Tell();
+ auto nStartShapePropTbl = rSt.Tell();
do
{
sal_uInt16 nPropId(0);
@@ -6324,7 +6324,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
break;
}
}
- while( nPropRead < nLenShapePropTbl );
+ while (rSt.good() && nPropRead < nLenShapePropTbl);
rSt.Seek( nStartShapePropTbl + nLenShapePropTbl );
nReadSpCont += nLenShapePropTbl;
}