lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-19 07:03:12 +03:00
Code Activity

examples: Fix freeing the channel in ssh_client

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
This commit is contained in:
Andreas Schneider
2019-07-08 15:00:16 +02:00
parent b275045ac8
commit 0734bc490f
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/ssh_client.c
View File

@ -239,7 +239,6 @@ static void select_loop(ssh_session session,ssh_channel channel)
ssh_connector_free(connector_err); ssh_connector_free(connector_err);
ssh_event_free(event); ssh_event_free(event);
ssh_channel_free(channel);
} }
static void shell(ssh_session session) static void shell(ssh_session session)
@ -247,7 +246,11 @@ static void shell(ssh_session session)
ssh_channel channel; ssh_channel channel;
struct termios terminal_local; struct termios terminal_local;
int interactive=isatty(0); int interactive=isatty(0);
channel = ssh_channel_new(session); channel = ssh_channel_new(session);
if (channel == NULL) {
return;
}
if (interactive) { if (interactive) {
tcgetattr(0, &terminal_local); tcgetattr(0, &terminal_local);
@ -256,6 +259,7 @@ static void shell(ssh_session session)
if (ssh_channel_open_session(channel)) { if (ssh_channel_open_session(channel)) {
printf("Error opening channel : %s\n", ssh_get_error(session)); printf("Error opening channel : %s\n", ssh_get_error(session));
ssh_channel_free(channel);
return; return;
} }
chan = channel; chan = channel;
@ -266,6 +270,7 @@ static void shell(ssh_session session)
if (ssh_channel_request_shell(channel)) { if (ssh_channel_request_shell(channel)) {
printf("Requesting shell : %s\n", ssh_get_error(session)); printf("Requesting shell : %s\n", ssh_get_error(session));
ssh_channel_free(channel);
return; return;
} }
@ -279,6 +284,7 @@ static void shell(ssh_session session)
if (interactive) { if (interactive) {
do_cleanup(0); do_cleanup(0);
} }
ssh_channel_free(channel);
} }
static void batch_shell(ssh_session session) static void batch_shell(ssh_session session)
@ -295,12 +301,18 @@ static void batch_shell(ssh_session session)
} }
channel = ssh_channel_new(session); channel = ssh_channel_new(session);
if (channel == NULL) {
return;
}
ssh_channel_open_session(channel); ssh_channel_open_session(channel);
if (ssh_channel_request_exec(channel, buffer)) { if (ssh_channel_request_exec(channel, buffer)) {
printf("Error executing '%s' : %s\n", buffer, ssh_get_error(session)); printf("Error executing '%s' : %s\n", buffer, ssh_get_error(session));
ssh_channel_free(channel);
return; return;
} }
select_loop(session, channel); select_loop(session, channel);
ssh_channel_free(channel);
} }
static int client(ssh_session session) static int client(ssh_session session)