Bug 1283164 - Fix some TLS 1.3 issues reported by Coverity r=franziskus

2 files changed, 11 insertions, 4 deletions

diff --git a/external_tests/ssl_gtest/libssl_internals.c b/external_tests/ssl_gtest/libssl_internals.c
index 66f8c2eb6..225b335de 100644
--- a/external_tests/ssl_gtest/libssl_internals.c
+++ b/external_tests/ssl_gtest/libssl_internals.c
@@ -184,15 +184,16 @@ PRBool sslint_DamageTrafficSecret(PRFileDesc *fd,
     return PR_FALSE;
   }
   keyPtr = (PK11SymKey **)((char *)&ss->ssl3.hs + offset);
-  if (!keyPtr)
+  if (!*keyPtr) {
     return PR_FALSE;
+  }
   PK11_FreeSymKey(*keyPtr);
-  *keyPtr = PK11_ImportSymKey(slot,
-                              CKM_NSS_HKDF_SHA256, PK11_OriginUnwrap,
+  *keyPtr = PK11_ImportSymKey(slot, CKM_NSS_HKDF_SHA256, PK11_OriginUnwrap,
                               CKA_DERIVE, &key_item, NULL);
   PK11_FreeSlot(slot);
-  if (!*keyPtr)
+  if (!*keyPtr) {
     return PR_FALSE;
+  }
 
   return PR_TRUE;
 }
diff --git a/lib/ssl/ssltrace.c b/lib/ssl/ssltrace.c
index 2bc76bb14..4d5af5a8c 100644
--- a/lib/ssl/ssltrace.c
+++ b/lib/ssl/ssltrace.c
@@ -48,6 +48,12 @@ ssl_PrintBuf(sslSocket *ss, const char *msg, const void *vp, int len)
     } else {
         SSL_TRACE(("%d: SSL: %s [Len: %d]", SSL_GETPID(), msg, len));
     }
+
+    if (!cp) {
+        SSL_TRACE(("   <NULL>"));
+        return;
+    }
+
     memset(buf, ' ', sizeof buf);
     bp = buf;
     ap = buf + 50;