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

[Caolán McNamara (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a86dd4df616227ed7e7be911653dac06973d8e25
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 16 11:25:53 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 17 09:55:17 2022 +0200

    cid#1500585 Dereference before null check
    
    Change-Id: I9374a580d3dce7c7851881ff8193946d46ed2bec
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138384
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index f36ca6431c8e..9fa6810d44da 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -253,11 +253,9 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription 
const & pTypeDescr)
         assert(false); // cannot happen
     }
     rtti = newRtti->get();
-    if (newRtti) {
-        auto insertion (
-            m_generatedRttis.emplace(unoName, std::move(newRtti)));
-        SAL_WARN_IF( !insertion.second, "bridges", "key " << unoName << " 
already in generated rtti map" );
-    }
+
+    auto insertion(m_generatedRttis.emplace(unoName, std::move(newRtti)));
+    SAL_WARN_IF( !insertion.second, "bridges", "key " << unoName << " already 
in generated rtti map" );
 
     return rtti;
 }