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

poll: Ensure that the poll handle and ctx is zeroed.

Browse Source
This commit is contained in:
Andreas Schneider
2011-01-03 09:07:02 +01:00
parent 2464a25de7
commit d679d5d7ef
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/poll.c
View File

@@ -306,18 +306,24 @@ int ssh_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
ssh_poll_handle ssh_poll_new(socket_t fd, short events, ssh_poll_callback cb, ssh_poll_handle ssh_poll_new(socket_t fd, short events, ssh_poll_callback cb,
void *userdata) { void *userdata) {
ssh_poll_handle p; ssh_poll_handle p;
p = malloc(sizeof(struct ssh_poll_handle_struct));
if (p == NULL) {
return NULL;
}
ZERO_STRUCTP(p);
p = malloc(sizeof(struct ssh_poll_handle_struct));
if (p != NULL) {
p->ctx = NULL;
p->x.fd = fd; p->x.fd = fd;
p->events = events; p->events = events;
p->cb = cb; if (cb != NULL) {
p->cb_data = userdata; p->cb = cb;
} }
if (userdata != NULL) {
p->cb_data = userdata;
}
return p; return p;
} }
@@ -450,22 +456,21 @@ void ssh_poll_set_callback(ssh_poll_handle p, ssh_poll_callback cb, void *userda
* library's default value. * library's default value.
*/ */
ssh_poll_ctx ssh_poll_ctx_new(size_t chunk_size) { ssh_poll_ctx ssh_poll_ctx_new(size_t chunk_size) {
ssh_poll_ctx ctx; ssh_poll_ctx ctx;
ctx = malloc(sizeof(struct ssh_poll_ctx_struct)); ctx = malloc(sizeof(struct ssh_poll_ctx_struct));
if (ctx != NULL) { if (ctx == NULL) {
if (!chunk_size) { return NULL;
chunk_size = SSH_POLL_CTX_CHUNK; }
ZERO_STRUCTP(ctx);
if (chunk_size == 0) {
chunk_size = SSH_POLL_CTX_CHUNK;
} }
ctx->chunk_size = chunk_size; ctx->chunk_size = chunk_size;
ctx->pollptrs = NULL;
ctx->pollfds = NULL;
ctx->polls_allocated = 0;
ctx->polls_used = 0;
}
return ctx; return ctx;
} }
/** /**