tls: fix another conn flag leading to crash

fixes a second case of a tls related value not getting reset when a connection structure is being reused.
dormando · Aug 25, 2024 · 9c81709 · 9c81709
1 parent 461d873
commit 9c81709
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/memcached.c b/memcached.c
@@ -744,17 +744,20 @@ conn *conn_new(const int sfd, enum conn_states init_state,
 
     c->item = 0;
     c->ssl = NULL;
+    c->ssl_wbuf = NULL;
 
     c->noreply = false;
 
     if (ssl) {
         // musn't get here without ssl enabled.
         assert(settings.ssl_enabled);
         ssl_init_conn(c, ssl);
+        c->ssl_enabled = true;
     } else {
         c->read = tcp_read;
         c->sendmsg = tcp_sendmsg;
         c->write = tcp_write;
+        c->ssl_enabled = false;
     }
 
     if (IS_UDP(transport)) {

diff --git a/tls.c b/tls.c
@@ -367,12 +367,7 @@ void ssl_init_conn(conn *c, void *ssl_in) {
         c->read = ssl_read;
         c->sendmsg = ssl_sendmsg;
         c->write = ssl_write;
-        c->ssl_enabled = true;
         SSL_set_info_callback(c->ssl, ssl_callback);
-    } else {
-        c->ssl = NULL;
-        c->ssl_wbuf = NULL;
-        c->ssl_enabled = false;
     }
 }