diff options
| author | Ryan Sleevi <ryan.sleevi@gmail.com> | 2013-08-09 14:08:06 -0700 |
|---|---|---|
| committer | Ryan Sleevi <ryan.sleevi@gmail.com> | 2013-08-09 14:08:06 -0700 |
| commit | bc35f7c6add7ef34e7e62604a8924cf3933ad7d2 (patch) | |
| tree | 9f028f874680e29fc2103ba5bfa1ada8c1f31749 | |
| parent | 975908598ea6ca1bb89c63dfb105f7572135e003 (diff) | |
| download | nss-hg-bc35f7c6add7ef34e7e62604a8924cf3933ad7d2.tar.gz | |
Bug 903565: Don't attempt to initialize the socket protocol variant when
ssl_NewSocket fails to initialize the socket.
r=wtc
| -rw-r--r-- | lib/ssl/sslsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c index cd4a7a73e..da4fbff90 100644 --- a/lib/ssl/sslsock.c +++ b/lib/ssl/sslsock.c @@ -2947,6 +2947,7 @@ ssl_NewSocket(PRBool makeLocks, SSLProtocolVariant protocolVariant) ss->opt.useSocks = PR_FALSE; ss->opt.noLocks = !makeLocks; ss->vrange = *VERSIONS_DEFAULTS(protocolVariant); + ss->protocolVariant = protocolVariant; ss->peerID = NULL; ss->rTimeout = PR_INTERVAL_NO_TIMEOUT; @@ -3000,7 +3001,6 @@ loser: PORT_Free(ss); ss = NULL; } - ss->protocolVariant = protocolVariant; } return ss; } |