[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Aug 30 11:44:13 UTC 2021


 sc/source/filter/lotus/lotimpop.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 50c4082b4c71173badd7641ea9b87e2e8a08b62f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 28 09:56:52 2021 +0100
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Aug 30 13:43:38 2021 +0200

    ofz: MemorySanitizer: use-of-uninitialized-value
    
    Change-Id: I649e8b8fa0d1752f0f4b0b6b688cea8ae945bb87
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121154
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Tested-by: Jenkins

diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 159b13786f6b..3970ac93a4d6 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -72,6 +72,9 @@ void ImportLotus::Bof()
     Skip( 1 );
     Read( nFlags );
 
+    if (!pIn->good())
+        return;
+
     if( nFileSub == 0x0004 )
     {
         if( nFileCode == 0x1000 )
@@ -87,7 +90,7 @@ void ImportLotus::Bof()
 
 bool ImportLotus::BofFm3()
 {
-    sal_uInt16  nFileCode, nFileSub;
+    sal_uInt16 nFileCode(0), nFileSub(0);
 
     Read( nFileCode );
     Read( nFileSub );


More information about the Libreoffice-commits mailing list