--- a/security/nss/lib/freebl/fipsfreebl.c
+++ b/security/nss/lib/freebl/fipsfreebl.c
@@ -1162,19 +1162,17 @@ freebl_fips_ECDSA_Test(ECParams *ecparam
     /* ECDSA Single-Round Known Answer Verification Test. */
     /******************************************************/
 
     /* Perform ECDSA verification process. */
     ecdsaStatus = ECDSA_VerifyDigest(&ecdsa_public_key, &signature, &digest);
 
 loser:
     /* free the memory for the private key arena*/
-    if (ecdsa_private_key != NULL) {
-        PORT_FreeArena(ecdsa_private_key->ecParams.arena, PR_FALSE);
-    }
+    PORT_FreeArena(ecdsa_private_key->ecParams.arena, PR_FALSE);
 
     if (ecdsaStatus != SECSuccess) {
         PORT_SetError( SEC_ERROR_LIBRARY_FAILURE );
         return( SECFailure );
     }
     return( SECSuccess );
 }
 

--- a/security/nss/lib/freebl/intel-gcm-wrap.c
+++ b/security/nss/lib/freebl/intel-gcm-wrap.c
@@ -133,19 +133,17 @@ intel_AES_GCMContext *intel_AES_GCM_Crea
         PORT_Memset(buff, 0, AES_BLOCK_SIZE);
         PORT_Memcpy(buff, gcmParams->pAAD + AAD_whole_len, AAD_remainder_len);
         intel_aes_gcmAAD(gcm->Htbl, buff, AES_BLOCK_SIZE, gcm->T);
     }
     gcm->Alen += gcmParams->ulAADLen;
     return gcm;
 
 loser:
-    if (gcm) {
-        PORT_Free(gcm);
-    }
+    PORT_Free(gcm);
     return NULL;
 }
 
 void intel_AES_GCM_DestroyContext(intel_AES_GCMContext *gcm, PRBool freeit)
 {
     if (freeit) {
         PORT_Free(gcm);
     }

--- a/security/nss/lib/smime/cmsdecode.c
+++ b/security/nss/lib/smime/cmsdecode.c
@@ -296,18 +296,17 @@ nss_cms_before_data(NSSCMSDecoderContext
 
     PORT_ArenaUnmark(poolp, mark);
 
     return SECSuccess;
 
 loser:
     if (mark)
 	PORT_ArenaRelease(poolp, mark);
-    if (childp7dcx)
-	PORT_Free(childp7dcx);
+    PORT_Free(childp7dcx);
     p7dcx->childp7dcx = NULL;
     return SECFailure;
 }
 
 static SECStatus
 nss_cms_after_data(NSSCMSDecoderContext *p7dcx)
 {
     NSSCMSDecoderContext *childp7dcx;