Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(892)

Unified Diff: net/third_party/nss/patches/sslsock_903565.patch

Issue 22758002: Fix a crash in SSL under memory pressure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/third_party/nss/patches/sslsock_903565.patch
diff --git a/net/third_party/nss/patches/sslsock_903565.patch b/net/third_party/nss/patches/sslsock_903565.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1648af573164790adf83819cfb07f11d7e5595f6
--- /dev/null
+++ b/net/third_party/nss/patches/sslsock_903565.patch
@@ -0,0 +1,20 @@
+diff --git a/net/third_party/nss/ssl/sslsock.c b/net/third_party/nss/ssl/sslsock.c
+index fd71aee..9464b67 100644
+--- a/net/third_party/nss/ssl/sslsock.c
++++ b/net/third_party/nss/ssl/sslsock.c
+@@ -3095,6 +3095,7 @@ ssl_NewSocket(PRBool makeLocks, SSLProtocolVariant protocolVariant)
+ ss->ephemeralECDHKeyPair = NULL;
+ ss->getChannelID = NULL;
+ ss->getChannelIDArg = NULL;
++ ss->protocolVariant = protocolVariant;
+
+ ssl_ChooseOps(ss);
+ ssl2_InitSocketPolicy(ss);
+@@ -3117,7 +3118,6 @@ loser:
+ PORT_Free(ss);
+ ss = NULL;
+ }
+- ss->protocolVariant = protocolVariant;
+ }
+ return ss;
+ }

Powered by Google App Engine
This is Rietveld 408576698