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

[Caolán McNamara (via logerrit)]

 sc/source/filter/lotus/lotimpop.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 17ca1c22e3526650a889daa893d34b2c66eec758
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Sep 1 11:32:42 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Sep 1 17:51:56 2021 +0200

    ofz: MemorySanitizer: use-of-uninitialized-value
    
    Change-Id: I8d581560433e555f7f26b4e24d1acd399acf4d52
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121445
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/filter/lotus/lotimpop.cxx 
b/sc/source/filter/lotus/lotimpop.cxx
index f1106b0c372c..c22a40634d22 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -178,7 +178,7 @@ void ImportLotus::Errcell()
 
     Read( aA );
 
-    if (!rD.ValidAddress(aA))
+    if (!pIn->good() || !rD.ValidAddress(aA))
     {
         SAL_WARN("sc.filter", "invalid address");
         return;
@@ -197,7 +197,7 @@ void ImportLotus::Nacell()
 
     Read( aA );
 
-    if (!rD.ValidAddress(aA))
+    if (!pIn->good() || !rD.ValidAddress(aA))
     {
         SAL_WARN("sc.filter", "invalid address");
         return;
@@ -220,7 +220,7 @@ void ImportLotus::Labelcell()
     Read( cAlign );
     Read( aLabel );
 
-    if (!rD.ValidAddress(aA))
+    if (!pIn->good() || !rD.ValidAddress(aA))
     {
         SAL_WARN("sc.filter", "invalid address");
         return;
@@ -241,7 +241,7 @@ void ImportLotus::Numbercell()
     Read( aAddr );
     Read( fVal );
 
-    if (!rD.ValidAddress(aAddr))
+    if (!pIn->good() || !rD.ValidAddress(aAddr))
     {
         SAL_WARN("sc.filter", "invalid address");
         return;
@@ -260,7 +260,7 @@ void ImportLotus::Smallnumcell()
     Read( aAddr );
     Read( nVal );
 
-    if (!rD.ValidAddress(aAddr))
+    if (!pIn->good() || !rD.ValidAddress(aAddr))
     {
         SAL_WARN("sc.filter", "invalid address");
         return;
@@ -291,7 +291,7 @@ void ImportLotus::Formulacell( sal_uInt16 n )
     if (!aConv.good())
         return;
 
-    if (!rD.ValidAddress(aAddr))
+    if (!pIn->good() || !rD.ValidAddress(aAddr))
     {
         SAL_WARN("sc.filter", "invalid address");
         return;