generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

_libssh2_channel_forward_cancel: avoid memory leaks on error

Browse Source 
Fixes #257
This commit is contained in:
Daniel Stenberg 2013-09-05 20:18:26 +02:00
parent 8da30ea4d4
commit 9f1b89e99b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/channel.c
View File

@ -606,6 +606,7 @@ int _libssh2_channel_forward_cancel(LIBSSH2_LISTENER *listener)
size_t packet_len = size_t packet_len =
host_len + 14 + sizeof("cancel-tcpip-forward") - 1; host_len + 14 + sizeof("cancel-tcpip-forward") - 1;
int rc; int rc;
int retcode = 0;
if (listener->chanFwdCncl_state == libssh2_NB_state_idle) { if (listener->chanFwdCncl_state == libssh2_NB_state_idle) {
_libssh2_debug(session, LIBSSH2_TRACE_CONN, _libssh2_debug(session, LIBSSH2_TRACE_CONN,
@ -644,9 +645,11 @@ int _libssh2_channel_forward_cancel(LIBSSH2_LISTENER *listener)
_libssh2_error(session, LIBSSH2_ERROR_SOCKET_SEND, _libssh2_error(session, LIBSSH2_ERROR_SOCKET_SEND,
"Unable to send global-request packet for forward " "Unable to send global-request packet for forward "
"listen request"); "listen request");
LIBSSH2_FREE(session, packet); /* set the state to something we don't check for, for the
listener->chanFwdCncl_state = libssh2_NB_state_idle; unfortunate situation where we get an EAGAIN further down
return LIBSSH2_ERROR_SOCKET_SEND; when trying to bail out due to errors! */
listener->chanFwdCncl_state = libssh2_NB_state_sent;
retcode = LIBSSH2_ERROR_SOCKET_SEND;
} }
LIBSSH2_FREE(session, packet); LIBSSH2_FREE(session, packet);
@ -670,7 +673,7 @@ int _libssh2_channel_forward_cancel(LIBSSH2_LISTENER *listener)
LIBSSH2_FREE(session, listener); LIBSSH2_FREE(session, listener);
return 0; return retcode;
} }
/* /*