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

[Norbert Thiebaud]

 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit cbe8883b51c532a9891afda720647709d1741adc
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Feb 18 04:04:16 2013 -0600

    coverity#982591 Dereference after null check
    
    Change-Id: I8651ecb0287d686da3e1ca6a6e46549abe3e0c38
    Reviewed-on: https://gerrit.libreoffice.org/2225
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index fa8f7d5..a3bda13 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -509,17 +509,20 @@ SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException
         }
 
         priKeyList = PK11_ListPrivateKeysInSlot(slot) ;
-        if( priKeyList != NULL ) {
+        if( priKeyList != NULL )
+        {
             for( curPri = PRIVKEY_LIST_HEAD( priKeyList );
                 !PRIVKEY_LIST_END( curPri, priKeyList ) && curPri != NULL ;
-                curPri = PRIVKEY_LIST_NEXT( curPri ) ) {
+                curPri = PRIVKEY_LIST_NEXT( curPri ) )
+            {
                 xcert = NssPrivKeyToXCert( curPri->key ) ;
                 if( xcert != NULL )
                     certsList.push_back( xcert ) ;
             }
+            SECKEY_DestroyPrivateKeyList( priKeyList ) ;
         }
 
-        SECKEY_DestroyPrivateKeyList( priKeyList ) ;
+
     }
 
     //secondly, we try to find certificate from registered private keys.