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

Noel Grandin noel at peralex.com
Fri Oct 3 07:02:21 PDT 2014


 connectivity/source/drivers/jdbc/JConnection.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f539e3f711d6253e65180f6c0f9567e5247a322
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Oct 3 16:00:30 2014 +0200

    cid#704588 Dereference after null check
    
    Change-Id: If84e072da9e59140466262fbeac4dc787a9de898

diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index b1e1777..a9b8ef9 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -718,7 +718,7 @@ void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClas
                     ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
                     m_pDriverobject = driverObject.release();
 
-                    if( t.pEnv && m_pDriverobject )
+                    if( m_pDriverobject )
                         m_pDriverobject = t.pEnv->NewGlobalRef( m_pDriverobject );
 
                     {


More information about the Libreoffice-commits mailing list