Index: net/third_party/nss/ssl/sslnonce.c |
diff --git a/net/third_party/nss/ssl/sslnonce.c b/net/third_party/nss/ssl/sslnonce.c |
index 3e42bed34e5f528bb98dd1038b6d0a70b0b7e53b..28ad36435ccf1e3f8c6581a63fb7d5f63c0fbb4e 100644 |
--- a/net/third_party/nss/ssl/sslnonce.c |
+++ b/net/third_party/nss/ssl/sslnonce.c |
@@ -441,6 +441,8 @@ ssl3_SetSIDSessionTicket(sslSessionID *sid, |
{ |
PORT_Assert(sid); |
PORT_Assert(newSessionTicket); |
+ PORT_Assert(newSessionTicket->ticket.data); |
+ PORT_Assert(newSessionTicket->ticket.len != 0); |
/* if sid->u.ssl3.lock, we are updating an existing entry that is already |
* cached or was once cached, so we need to acquire and release the write |
@@ -449,10 +451,6 @@ ssl3_SetSIDSessionTicket(sslSessionID *sid, |
*/ |
if (sid->u.ssl3.lock) { |
NSSRWLock_LockWrite(sid->u.ssl3.lock); |
- |
- /* A server might have sent us an empty ticket, which has the |
- * effect of clearing the previously known ticket. |
- */ |
if (sid->u.ssl3.locked.sessionTicket.ticket.data) { |
SECITEM_FreeItem(&sid->u.ssl3.locked.sessionTicket.ticket, |
PR_FALSE); |