Use existing session context if new is actually NULL

torben-hansen · torben-hansen · commit 05fba68d6daa · 2026-01-16T16:03:42.000-08:00
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
@@ -2856,7 +2856,8 @@ SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx) {
   if (!ssl->config) {
     return NULL;
   }
-  if (ssl->ctx.get() == ctx) {
+
+  if (!ctx || ssl->ctx.get() == ctx) {
     return ssl->ctx.get();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -2856,7 +2856,8 @@ SSL_CTX SSL_set_SSL_CTX(SSL ssl, SSL_CTX *ctx) {`
`2856`	`2856`	`if (!ssl->config) {`
`2857`	`2857`	`return NULL;`
`2858`	`2858`	`}`
`2859`		`- if (ssl->ctx.get() == ctx) {`
	`2859`	`+`
	`2860`	`+ if (!ctx \|\| ssl->ctx.get() == ctx) {`
`2860`	`2861`	`return ssl->ctx.get();`
`2861`	`2862`	`}`
`2862`	`2863`