Bug 1651834 - Fix various static analyzer warnings. r=rrelyea

Differential Revision: https://phabricator.services.mozilla.com/D87452 --HG-- extra : moz-landing-system : lando
sailfishos-mirror · Aug 24, 2020 · 7dccc54 · 7dccc54
1 parent 3083761
commit 7dccc54
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/lib/pk11wrap/pk11cxt.c b/lib/pk11wrap/pk11cxt.c
@@ -1159,6 +1159,9 @@ pk11_AEADSimulateOp(PK11Context *context, void *params, int paramslen,
          * the tag. We'll copy the tag after the operation */
         if (maxout < inlen + taglen) {
             allocOut = PORT_Alloc(inlen + taglen);
+            if (allocOut == NULL) {
+                return SECFailure;
+            }
             out = allocOut;
             length = maxout = inlen + taglen;
         }
@@ -1616,7 +1619,6 @@ pk11_Finalize(PK11Context *context)
         } else {
             buffer = PORT_Alloc(count);
             if (buffer == NULL) {
-                PORT_SetError(SEC_ERROR_NO_MEMORY);
                 return SECFailure;
             }
         }

diff --git a/lib/softoken/pkcs11c.c b/lib/softoken/pkcs11c.c
@@ -7030,7 +7030,7 @@ sftk_HKDF(CK_HKDF_PARAMS_PTR params, CK_SESSION_HANDLE hSession,
     PORT_Memset(keyBlockData, 0, genLen);
     PORT_Memset(hashbuf, 0, sizeof(hashbuf));
     PORT_Free(keyBlockAlloc);
-    return CKR_OK;
+    return crv;
 }
 
 /*

diff --git a/lib/softoken/sdb.c b/lib/softoken/sdb.c
@@ -2233,7 +2233,7 @@ sdb_init(char *dbname, char *table, sdbDataType type, int *inUpdate,
             goto loser;
         }
         unsigned int schemaAttrsCapacity = known_attributes_size;
-        sdb_p->schemaAttrs = malloc(schemaAttrsCapacity * sizeof(CK_ATTRIBUTE));
+        sdb_p->schemaAttrs = malloc(schemaAttrsCapacity * sizeof(CK_ATTRIBUTE_TYPE));
         if (!sdb_p->schemaAttrs) {
             error = CKR_HOST_MEMORY;
             goto loser;
@@ -2247,7 +2247,7 @@ sdb_init(char *dbname, char *table, sdbDataType type, int *inUpdate,
                 if (backedAttrs == schemaAttrsCapacity) {
                     schemaAttrsCapacity += known_attributes_size;
                     sdb_p->schemaAttrs = realloc(sdb_p->schemaAttrs,
-                                                 schemaAttrsCapacity * sizeof(CK_ATTRIBUTE));
+                                                 schemaAttrsCapacity * sizeof(CK_ATTRIBUTE_TYPE));
                     if (!sdb_p->schemaAttrs) {
                         error = CKR_HOST_MEMORY;
                         goto loser;

diff --git a/lib/softoken/sftkpwd.c b/lib/softoken/sftkpwd.c
@@ -92,6 +92,11 @@ sftkdb_passwordToKey(SFTKDBHandle *keydb, SECItem *salt,
     SHA1Context *cx = NULL;
     SECStatus rv = SECFailure;
 
+    if (!pw) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
     key->data = PORT_Alloc(SHA1_LENGTH);
     if (key->data == NULL) {
         goto loser;