Fix potential crash with SSL connections

sirainen · sirainen · commit c9a9495eb9fc · 2020-01-15T16:56:38.000+02:00
Old IO wasn't removed before SSL handshake attempted to add it.

Fixes:
Panic: io_add(0x2) called twice fd=.., callback=.. -&gt; ..
diff --git a/src/client.c b/src/client.c
@@ -142,6 +142,9 @@ static void client_wait_connect(struct client *client)
 		return;
 	}
 
+	/* remove before ssl handshake */
+	io_remove(&client->io);
+
 	if (conf.ssl) {
 		if (ssl_ctx == NULL) {
 			if (ssl_iostream_context_init_client(&conf.ssl_set, &ssl_ctx, &error) < 0)
@@ -160,7 +163,6 @@ static void client_wait_connect(struct client *client)
 			client->rawlog_fd = o_stream_get_fd(client->output);
 	}
 
-	io_remove(&client->io);
 	client->io = io_add_istream(client->input, client_input, client);
 	client->v.connected(client);
 }

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,9 @@ static void client_wait_connect(struct client *client)`
`142`	`142`	`return;`
`143`	`143`	`}`
`144`	`144`
	`145`	`+ /* remove before ssl handshake */`
	`146`	`+ io_remove(&client->io);`
	`147`	`+`
`145`	`148`	`if (conf.ssl) {`
`146`	`149`	`if (ssl_ctx == NULL) {`
`147`	`150`	`if (ssl_iostream_context_init_client(&conf.ssl_set, &ssl_ctx, &error) < 0)`
`@@ -160,7 +163,6 @@ static void client_wait_connect(struct client *client)`
`160`	`163`	`client->rawlog_fd = o_stream_get_fd(client->output);`
`161`	`164`	`}`
`162`	`165`
`163`		`- io_remove(&client->io);`
`164`	`166`	`client->io = io_add_istream(client->input, client_input, client);`
`165`	`167`	`client->v.connected(client);`
`166`	`168`	`}`