filter/source/msfilter/msdffimp.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 14d6a07abd7685d8867731938d4c8c3483672909
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Nov 21 12:17:04 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Nov 21 14:29:27 2019 +0100
ofz#19034 fix ~infinite loop
Change-Id: Ibc90b3b68a55f8396fbe623eb0db6c289fe978a1
Reviewed-on: https://gerrit.libreoffice.org/83383
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
