Bug 1277228 - scan-build on ckfw, crmf, cryptohi, nss, and dev, r=tta…

…ubert Differential Revision: https://nss-dev.phacility.com/D119 --HG-- extra : rebase_source : 5f87224c8c746f8ea7a2d2c3f1c08d5b27318bff extra : amend_source : 4effb4bcbf56e5670581a0eb221160d7a4b3a585
sailfishos-mirror · Oct 26, 2016 · 62ad08b · 62ad08b
1 parent 2e3189f
commit 62ad08b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/automation/taskcluster/scripts/run_scan_build.sh b/automation/taskcluster/scripts/run_scan_build.sh
@@ -23,8 +23,13 @@ declare -A scan=( \
         [lib/base]=0 \
         [lib/certdb]=0 \
         [lib/certhigh]=0 \
-        [lib/ssl]=0 \
+        [lib/ckfw]=0 \
+        [lib/crmf]=0 \
+        [lib/cryptohi]=0 \
+        [lib/dev]=0 \
         [lib/freebl]=0 \
+        [lib/nss]=0 \
+        [lib/ssl]=0 \
         [lib/util]=0 \
     )
 

diff --git a/lib/ckfw/mechanism.c b/lib/ckfw/mechanism.c
@@ -99,7 +99,7 @@ nssCKFWMechanism_Destroy(
 {
     /* destroy any fw resources held by nssCKFWMechanism (currently none) */
 
-    if (!fwMechanism->mdMechanism->Destroy) {
+    if (fwMechanism->mdMechanism->Destroy) {
         /* destroys it's parent as well */
         fwMechanism->mdMechanism->Destroy(
             fwMechanism->mdMechanism,

diff --git a/lib/crmf/cmmfchal.c b/lib/crmf/cmmfchal.c
@@ -34,7 +34,9 @@ cmmf_create_witness_and_challenge(PLArenaPool *poolp,
 
     encodedRandNum = SEC_ASN1EncodeInteger(poolp, &challenge->randomNumber,
                                            inRandom);
-    encodedRandNum = &challenge->randomNumber;
+    if (!encodedRandNum) {
+        goto loser;
+    }
     randHash = PORT_ArenaNewArray(poolp, unsigned char, SHA1_LENGTH);
     senderHash = PORT_ArenaNewArray(poolp, unsigned char, SHA1_LENGTH);
     if (randHash == NULL) {

diff --git a/lib/cryptohi/seckey.c b/lib/cryptohi/seckey.c
@@ -315,8 +315,6 @@ seckey_UpdateCertPQGChain(CERTCertificate *subjectCert, int count)
     CERTSubjectPublicKeyInfo *issuerSpki = NULL;
     CERTCertificate *issuerCert = NULL;
 
-    rv = SECSuccess;
-
     /* increment cert chain length counter*/
     count++;
 
@@ -649,7 +647,6 @@ seckey_ExtractPublicKey(const CERTSubjectPublicKeyInfo *spki)
 
             default:
                 PORT_SetError(SEC_ERROR_UNSUPPORTED_KEYALG);
-                rv = SECFailure;
                 break;
         }
 

diff --git a/lib/nss/nssinit.c b/lib/nss/nssinit.c
@@ -98,7 +98,6 @@ nss_makeFlags(PRBool readOnly, PRBool noCertDB,
         if (!first)
             PORT_Strcat(flags, ",");
         PORT_Strcat(flags, "optimizeSpace");
-        first = PR_FALSE;
     }
     return flags;
 }