Fix a crash in SSL under memory pressure

net/third_party/nss/ssl/sslsock.c

 /*
  * vtables (and methods that call through them) for the 4 types of 
  * SSLSockets supported.  Only one type is still supported.
  * Various other functions.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "seccomon.h"
 #include "cert.h"
@@ skipping 3038 matching lines @@
     if (ss) {
         /* This should be of type SSLKEAType, but CC on IRIX
          * complains during the for loop.
          */
         int i;
         SECStatus status;
  
         ss->opt                = ssl_defaults;
         ss->opt.useSocks       = PR_FALSE;
         ss->opt.noLocks        = !makeLocks;
         ss->vrange             = *VERSIONS_DEFAULTS(protocolVariant);

[wtc, 2013/08/09 21:34:42]

Please move the
    ss->protocolVariant = protocolVariant;
statement here, as you did in the NSS upstream change:
https://hg.mozilla.org/projects/nss/rev/de33c29a6bde

 
         ss->peerID             = NULL;
         ss->rTimeout           = PR_INTERVAL_NO_TIMEOUT;
         ss->wTimeout           = PR_INTERVAL_NO_TIMEOUT;
         ss->cTimeout           = PR_INTERVAL_NO_TIMEOUT;
         ss->cipherSpecs        = NULL;
         ss->sizeCipherSpecs    = 0;  /* produced lazily */
         ss->preferredCipher    = NULL;
         ss->url                = NULL;
 
@@ skipping 18 matching lines @@
 #ifdef NSS_PLATFORM_CLIENT_AUTH
         ss->getPlatformClientAuthData = NULL;
         ss->getPlatformClientAuthDataArg = NULL;
 #endif   /* NSS_PLATFORM_CLIENT_AUTH */
         ss->handleBadCert      = NULL;
         ss->badCertArg         = NULL;
         ss->pkcs11PinArg       = NULL;
         ss->ephemeralECDHKeyPair = NULL;
         ss->getChannelID       = NULL;
         ss->getChannelIDArg    = NULL;
+        ss->protocolVariant = protocolVariant;
 
         ssl_ChooseOps(ss);
         ssl2_InitSocketPolicy(ss);
         ssl3_InitSocketPolicy(ss);
         PR_INIT_CLIST(&ss->ssl3.hs.lastMessageFlight);
 
         if (makeLocks) {
             status = ssl_MakeLocks(ss);
             if (status != SECSuccess)
                 goto loser;
         }
         status = ssl_CreateSecurityInfo(ss);
         if (status != SECSuccess) 
             goto loser;
         status = ssl_InitGather(&ss->gs);
         if (status != SECSuccess) {
 loser:
             ssl_DestroySocketContents(ss);
             ssl_DestroyLocks(ss);
             PORT_Free(ss);
             ss = NULL;
         }
-        ss->protocolVariant = protocolVariant;
     }
     return ss;
 }