diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-21 12:17:04 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-01-12 11:13:35 +0100 |
| commit | 49b5cd7dd76ae7bbab12fc1316f713b884928466 (patch) | |
| tree | f0400aa7406b8cd37d993ef19548242f5533c3b1 /filter | |
| parent | 3d9d161cfebeafc7910f07a15c4267b9375f53e7 (diff) | |
ofz#19034 fix ~infinite loop
Change-Id: Ibc90b3b68a55f8396fbe623eb0db6c289fe978a1
Reviewed-on: https://gerrit.libreoffice.org/83383
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 29fd41a9879c..2ad21b4b8477 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6246,7 +6246,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); @@ -6329,7 +6329,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, break; } } - while( nPropRead < nLenShapePropTbl ); + while (rSt.good() && nPropRead < nLenShapePropTbl); rSt.Seek( nStartShapePropTbl + nLenShapePropTbl ); nReadSpCont += nLenShapePropTbl; } |