Bug 1433644 - sid uncache hotfix, r=ttaubert

Differential Revision: https://phabricator.services.mozilla.com/D470

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/ssl/sslnonce.c b/lib/ssl/sslnonce.c
index f99d44ba4..f79c23fc7 100644
--- a/lib/ssl/sslnonce.c
+++ b/lib/ssl/sslnonce.c
@@ -1134,10 +1134,12 @@ ssl_UncacheSessionID(sslSocket *ss)
     sslSecurityInfo *sec = &ss->sec;
     PORT_Assert(sec);
 
-    if (sec->isServer) {
-        ssl_ServerUncacheSessionID(sec->ci.sid);
-    } else if (!ss->resumptionTokenCallback) {
-        LockAndUncacheSID(sec->ci.sid);
+    if (sec->ci.sid) {
+        if (sec->isServer) {
+            ssl_ServerUncacheSessionID(sec->ci.sid);
+        } else if (!ss->resumptionTokenCallback) {
+            LockAndUncacheSID(sec->ci.sid);
+        }
     }
 }