Bug 1445731 - land NSS 1bde21f90bd1 UPGRADE_NSS_RELEASE, r=me

--HG--
extra : rebase_source : b23946c3f8f8ca33b1fe42f67febe604d36c6411

security/nss/TAG-INFO

@@ -1 +1 @@
-c5dffd6269ea
+1bde21f90bd1

security/nss/coreconf/coreconf.dep

@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-

security/nss/lib/ssl/ssl3ext.c

@@ -681,7 +681,11 @@ ssl_CallCustomExtensionSenders(sslSocket *ss, sslBuffer *buf,
         }
     }
 
-    sslBuffer_Append(buf, tail.buf, tail.len);
+    rv = sslBuffer_Append(buf, tail.buf, tail.len);
+    if (rv != SECSuccess) {
+        goto loser; /* Code already set. */
+    }
+
     sslBuffer_Clear(&tail);
     return SECSuccess;
 

security/nss/lib/ssl/ssl3gthr.c

@@ -350,7 +350,7 @@ dtls_GatherData(sslSocket *ss, sslGather *gs, int flags)
     } else if (headerLen == 7) {
         gs->remainder = (gs->hdr[5] << 8) | gs->hdr[6];
     } else {
-        PORT_Assert(headerLen = 2);
+        PORT_Assert(headerLen == 2);
         gs->remainder = gs->dtlsPacket.len - gs->dtlsPacketOffset;
     }