lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

connector: ensure channel callbacks are removed

Browse Source 
ssh_connector_free fails to remove the in/out channel callbacks
as ssh_connector_remove_event sets the in/out channel variables
to NULL.

Have ssh_connector_free, remove the channel callbacks first before
invoking ssh_connector_remove_event.

Signed-off-by: Alberto Aguirre <albaguirre@gmail.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Alberto Aguirre
2018-02-26 10:16:01 -06:00
committed by Andreas Schneider
parent 25f31760aa
commit 85ab4ee53a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/connector.c
View File

@@ -106,6 +106,15 @@ ssh_connector ssh_connector_new(ssh_session session)
void ssh_connector_free (ssh_connector connector) void ssh_connector_free (ssh_connector connector)
{ {
if (connector->in_channel != NULL) {
ssh_remove_channel_callbacks(connector->in_channel,
&connector->in_channel_cb);
}
if (connector->out_channel != NULL) {
ssh_remove_channel_callbacks(connector->out_channel,
&connector->out_channel_cb);
}
if (connector->event != NULL){ if (connector->event != NULL){
ssh_connector_remove_event(connector); ssh_connector_remove_event(connector);
} }
@@ -120,15 +129,6 @@ void ssh_connector_free (ssh_connector connector)
connector->out_poll = NULL; connector->out_poll = NULL;
} }
if (connector->in_channel != NULL) {
ssh_remove_channel_callbacks(connector->in_channel,
&connector->in_channel_cb);
}
if (connector->out_channel != NULL) {
ssh_remove_channel_callbacks(connector->out_channel,
&connector->out_channel_cb);
}
free(connector); free(connector);
} }