aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2013-12-22 22:08:45 +0100
committerAndreas Schneider <asn@cryptomilk.org>2013-12-22 22:08:45 +0100
commit8f162e3b13aa85aaa1257b775e1dc5d103f45570 (patch)
tree95fe60bafc6ea5800324fbf8be661a5214b692c2 /src
parent32ba84dac7d82e043c8189b24ff5dfcab01bb052 (diff)
downloadlibssh-8f162e3b13aa85aaa1257b775e1dc5d103f45570.tar.gz
libssh-8f162e3b13aa85aaa1257b775e1dc5d103f45570.tar.xz
libssh-8f162e3b13aa85aaa1257b775e1dc5d103f45570.zip
poll: Correctly free ssh_event_fd_wrapper.
This is allocated by ssh_event_add_fd.
Diffstat (limited to 'src')
-rw-r--r--src/poll.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/poll.c b/src/poll.c
index 2fce52a3..4d92e3f3 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -852,12 +852,18 @@ int ssh_event_remove_fd(ssh_event event, socket_t fd) {
for (i = 0; i < used; i++) {
if(fd == event->ctx->pollfds[i].fd) {
ssh_poll_handle p = event->ctx->pollptrs[i];
- struct ssh_event_fd_wrapper *pw = p->cb_data;
+ if (p->cb == ssh_event_fd_wrapper_callback) {
+ struct ssh_event_fd_wrapper *pw = p->cb_data;
+ SAFE_FREE(pw);
+ }
- ssh_poll_ctx_remove(event->ctx, p);
- free(pw);
+ /*
+ * The free function calls ssh_poll_ctx_remove() and decrements
+ * event->ctx->polls_used.
+ */
ssh_poll_free(p);
rc = SSH_OK;
+
/* restart the loop */
used = event->ctx->polls_used;
i = 0;