[Libreoffice-commits] core.git: 2 commits - connectivity/source sal/qa

[Stephan Bergmann (via logerrit)]

 connectivity/source/drivers/hsqldb/HStorageAccess.cxx |    2 +-
 sal/qa/osl/mutex/osl_Mutex.cxx                        |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 931996e61be61246f5d0c84f0c6caf314d3ef79f
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Mar 4 15:31:59 2022 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Mar 4 17:17:36 2022 +0100

    Avoid "ThreadSanitizer: unlock of an unlocked mutex"
    
    ...in (somewhat contorted) test code
    
    Change-Id: I247a30e580b3d458eb748a833100a662c9890d99
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130991
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index c345ae33eb2b..3424bca07b3c 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -807,6 +807,8 @@ namespace osl_ResettableGuard
 
             CPPUNIT_ASSERT_MESSAGE("ResettableMutexGuard constructor, test the 
acquire operation when initialized.",
                 bRes);
+
+            aMutex.acquire();
         }
 
         void ctor_002( )
@@ -821,6 +823,8 @@ namespace osl_ResettableGuard
 
             CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard constructor, test 
the acquire operation when initialized, we use reference constructor this 
time.",
                 bRes);
+
+            aMutex.acquire();
         }
 
         CPPUNIT_TEST_SUITE(ctor);
@@ -853,6 +857,8 @@ namespace osl_ResettableGuard
                 bRes );
             CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset",
                 bRes1 );
+
+            aMutex.acquire();
         }
 
 #ifdef LINUX
@@ -863,6 +869,7 @@ namespace osl_ResettableGuard
 
             /// shouldn't release after clear;
             myMutexGuard.clear( );
+            aMutex.acquire();
             bool bRes = aMutex.release( );
 
             /// can release after reset.
@@ -870,9 +877,11 @@ namespace osl_ResettableGuard
             bool bRes1 = aMutex.release( );
 
             CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset, 
release after clear and reset, on Solaris, the mutex can be release without 
acquire, so it can not passed on (SOLARIS), but not the reason for reset_002",
-                !bRes );
+                bRes );
             CPPUNIT_ASSERT_MESSAGE( "ResettableMutexGuard method: reset, 
release after clear and reset, on Solaris, the mutex can be release without 
acquire, so it can not passed on (SOLARIS), but not the reason for reset_002",
                 bRes1 );
+
+            aMutex.acquire();
         }
 #endif
 
commit 9013ee1a00502b891637fe050f1c133b36d6d151
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Mar 4 13:49:58 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Mar 4 17:17:27 2022 +0100

    cid#1500701 silence Dereference after null check
    
    Change-Id: Iccd159c81011863cd664a2903dd14006bdc3b8a0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130988
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx 
b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index f4f67a8e394a..36ef9f287347 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -344,7 +344,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL 
Java_com_sun_star_sdbcx_comp_hsqldb_Nativ
     Reference< XSeekable> xSeek = pHelper ? pHelper->getSeek() : Reference< 
XSeekable>();
 
     OSL_ENSURE(xSeek.is(),"No Seekable stream!");
-    if ( !xSeek.is() )
+    if (!xSeek)
         return;
 
 #ifdef HSQLDB_DBG