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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sat Jan 9 20:13:52 UTC 2021


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

New commits:
commit 684885a99a1eb7ad943e9736166d4bb1468663be
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jan 9 19:26:59 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Jan 9 21:13:07 2021 +0100

    ofz#29443 uncaught exception
    
    Change-Id: I35b0c23f6b6df6d5e4d7e89fce84e8e0f306d8e1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109038
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index 7788802c4e1c..472f7ec9d358 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -109,7 +109,7 @@ namespace emfio::emfreader
                 pStream->SetEndian(SvStreamEndian::LITTLE);
 
                 sal_uInt32 nMetaType(0);
-                if (checkSeek(*pStream, 0x28))
+                if (checkSeek(*pStream, 0x28) && pStream->remainingSize() >= 4)
                     pStream->ReadUInt32(nMetaType);
                 pStream->Seek(nOrgPos);
 


More information about the Libreoffice-commits mailing list