[Libreoffice-commits] core.git: emfio/source

[Caolán McNamara (via logerrit)]

 emfio/source/reader/emfreader.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e33290f3ea2b347683912ff89615ba3ae6298dde
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 3 08:52:51 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 3 10:47:44 2021 +0200

    ofz#34867 Timeout
    
    Change-Id: Ia07b8b4c41233c0f66239d2f37833ddecc0dd278
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116640
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index b0fafab81604..dc5941493058 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1824,7 +1824,7 @@ namespace emfio
                             mpInputStream->ReadUInt32( ncStrings );
                             SAL_INFO("emfio", "\t\t Number of Text objects: " << ncStrings);
                         }
-                        for ( sal_uInt32 nStringNo = 0; nStringNo < ncStrings; nStringNo++ )
+                        for (sal_uInt32 nStringNo = 0; nStringNo < ncStrings && mpInputStream->good(); ++nStringNo)
                         {
                             mpInputStream->ReadInt32( ptlReferenceX ).ReadInt32( ptlReferenceY ).ReadUInt32( nLen ).ReadUInt32( nOffString ).ReadUInt32( nOptions );
                             SAL_INFO("emfio", "\t\tReference: (" << ptlReferenceX << ", " << ptlReferenceY << ")");