From 1b627b386763e22a7b8f7a7c8de9610c1da56cd2 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 1 Apr 2009 20:24:09 +0000 Subject: More memory error checks for ssh_socket_new(). git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@329 7dcaeef0-15fb-0310-b436-a5af3365683c --- libssh/socket.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'libssh/socket.c') diff --git a/libssh/socket.c b/libssh/socket.c index 03797d6..0fe4ad5 100644 --- a/libssh/socket.c +++ b/libssh/socket.c @@ -88,22 +88,32 @@ void ssh_socket_init(void) { * \internal * \brief creates a new Socket object */ -struct socket *ssh_socket_new(SSH_SESSION *session){ - struct socket *s; +struct socket *ssh_socket_new(SSH_SESSION *session) { + struct socket *s; - s = malloc(sizeof(struct socket)); - if (s = NULL) { - return NULL; - } - s->fd=-1; - s->last_errno=-1; - s->session=session; - s->in_buffer=buffer_new(); - s->out_buffer=buffer_new(); - s->data_to_read=0; - s->data_to_write=0; - s->data_except=0; - return s; + s = malloc(sizeof(struct socket)); + if (s == NULL) { + return NULL; + } + s->fd = -1; + s->last_errno = -1; + s->session = session; + s->in_buffer = buffer_new(); + if (s->in_buffer == NULL) { + SAFE_FREE(s); + return NULL; + } + s->out_buffer=buffer_new(); + if (s->out_buffer == NULL) { + buffer_free(s->in_buffer); + SAFE_FREE(s); + return NULL; + } + s->data_to_read = 0; + s->data_to_write = 0; + s->data_except = 0; + + return s; } /* \internal -- cgit