Restore old interface if TLS connection failed

sjaeckel · sjaeckel · commit 9fef4b7d024b · 2024-04-10T17:22:14.000+02:00
This was reported as creating a segfault in [0] [0] profanity-im/profanity#1963 Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
diff --git a/src/conn.c b/src/conn.c
@@ -1092,6 +1092,7 @@ int conn_tls_start(xmpp_conn_t *conn)
     }
 
     if (conn->tls != NULL) {
+        struct conn_interface old_intf = conn->intf;
         conn->intf = tls_intf;
         conn->intf.conn = conn;
         if (tls_start(conn->tls)) {
@@ -1102,6 +1103,7 @@ int conn_tls_start(xmpp_conn_t *conn)
             tls_free(conn->tls);
             conn->tls = NULL;
             conn->tls_failed = 1;
+            conn->intf = old_intf;
         }
     }
     if (rc != 0) {

Original file line number	Diff line number	Diff line change
`@@ -1092,6 +1092,7 @@ int conn_tls_start(xmpp_conn_t *conn)`
`1092`	`1092`	`}`
`1093`	`1093`
`1094`	`1094`	`if (conn->tls != NULL) {`
	`1095`	`+ struct conn_interface old_intf = conn->intf;`
`1095`	`1096`	`conn->intf = tls_intf;`
`1096`	`1097`	`conn->intf.conn = conn;`
`1097`	`1098`	`if (tls_start(conn->tls)) {`
`@@ -1102,6 +1103,7 @@ int conn_tls_start(xmpp_conn_t *conn)`
`1102`	`1103`	`tls_free(conn->tls);`
`1103`	`1104`	`conn->tls = NULL;`
`1104`	`1105`	`conn->tls_failed = 1;`
	`1106`	`+ conn->intf = old_intf;`
`1105`	`1107`	`}`
`1106`	`1108`	`}`
`1107`	`1109`	`if (rc != 0) {`