Bug 1308866 - Make cert test suite run with ASan+LSan+UBSan r=franziskus

Differential Revision: https://nss-dev.phacility.com/D78 --HG-- extra : amend_source : e740584ad8b6f308098db21514bc0e38709c6c95
sailfishos-mirror · Oct 12, 2016 · 03788a2 · 03788a2
1 parent 1044f92
commit 03788a2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/cmd/certutil/certext.c b/cmd/certutil/certext.c
@@ -1240,10 +1240,15 @@ AddCrlDistPoint(void *extHandle)
             }
         }
 
-        crlDistPoints->distPoints =
-            PORT_ArenaGrow(arena, crlDistPoints->distPoints,
-                           sizeof(*crlDistPoints->distPoints) * count,
-                           sizeof(*crlDistPoints->distPoints) * (count + 1));
+        if (crlDistPoints->distPoints) {
+            crlDistPoints->distPoints =
+                PORT_ArenaGrow(arena, crlDistPoints->distPoints,
+                               sizeof(*crlDistPoints->distPoints) * count,
+                               sizeof(*crlDistPoints->distPoints) * (count + 1));
+        } else {
+            crlDistPoints->distPoints =
+                PORT_ArenaZAlloc(arena, sizeof(*crlDistPoints->distPoints) * (count + 1));
+        }
         if (crlDistPoints->distPoints == NULL) {
             GEN_BREAK(SECFailure);
         }

diff --git a/lib/certdb/crl.c b/lib/certdb/crl.c
@@ -1958,10 +1958,11 @@ DPCache_SelectCRL(CRLDPCache* cache)
         qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), SortImperfectCRLs);
         return SECSuccess;
     }
-    /* all CRLs are good, sort them by thisUpdate */
-    qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), SortCRLsByThisUpdate);
 
     if (cache->ncrls) {
+        /* all CRLs are good, sort them by thisUpdate */
+        qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), SortCRLsByThisUpdate);
+
         /* pick the newest CRL */
         selected = cache->crls[cache->ncrls - 1];
 

diff --git a/lib/freebl/alg2268.c b/lib/freebl/alg2268.c
@@ -10,6 +10,7 @@
 #endif
 
 #include "blapi.h"
+#include "blapii.h"
 #include "secerr.h"
 #ifdef XP_UNIX_XXX
 #include <stddef.h> /* for ptrdiff_t */
@@ -418,7 +419,7 @@ rc2_EncryptCBC(RC2Context *cx, unsigned char *output,
     return SECSuccess;
 }
 
-static SECStatus
+static SECStatus NO_SANITIZE_ALIGNMENT
 rc2_DecryptCBC(RC2Context *cx, unsigned char *output,
                const unsigned char *input, unsigned int inputLen)
 {

diff --git a/lib/softoken/legacydb/lgattr.c b/lib/softoken/legacydb/lgattr.c
@@ -1411,7 +1411,9 @@ lg_cmpAttribute(LGObjectCache *obj, const CK_ATTRIBUTE *attribute)
     /* get the attribute */
     crv = lg_GetSingleAttribute(obj, &testAttr);
     /* if the attribute was read OK, compare it */
-    if ((crv != CKR_OK) || (attribute->ulValueLen != testAttr.ulValueLen) ||
+    if ((crv != CKR_OK) ||
+        (attribute->pValue == NULL) ||
+        (attribute->ulValueLen != testAttr.ulValueLen) ||
         (PORT_Memcmp(attribute->pValue, testAttr.pValue, testAttr.ulValueLen) != 0)) {
         /* something didn't match, this isn't the object we are looking for */
         match = PR_FALSE;

diff --git a/lib/softoken/legacydb/pcertdb.c b/lib/softoken/legacydb/pcertdb.c
@@ -2172,7 +2172,11 @@ EncodeDBSubjectEntry(certDBEntrySubject *entry, PLArenaPool *arena,
     buf[4] = 0;
     buf[5] = 0;
 
-    PORT_Memcpy(&buf[DB_SUBJECT_ENTRY_HEADER_LEN], entry->nickname, nnlen);
+    PORT_Assert(DB_SUBJECT_ENTRY_HEADER_LEN == 6);
+
+    if (entry->nickname) {
+        PORT_Memcpy(&buf[DB_SUBJECT_ENTRY_HEADER_LEN], entry->nickname, nnlen);
+    }
     tmpbuf = &buf[keyidoff];
     for (i = 0; i < ncerts; i++) {
         tmpbuf[0] = (PRUint8)(certKeys[i].len >> 8);