lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-06-02 03:41:34 +03:00
Code

Fix crash in testcase proxycommand

Browse Source
This commit is contained in:
Aris Adamantiadis 2010-05-10 21:50:03 +02:00
parent 8ba02b6f4c
commit fe16cce405
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libssh/socket.c
View File

@ -153,6 +153,10 @@ int ssh_socket_pollcallback(ssh_poll_handle p, socket_t fd, int revents, void *v
int r,w; int r,w;
int err=0; int err=0;
socklen_t errlen=sizeof(err); socklen_t errlen=sizeof(err);
/* Do not do anything if this socket was already closed */
if(!ssh_socket_is_open(s)){
return -1;
}
if(revents & POLLERR){ if(revents & POLLERR){
/* Check if we are in a connecting state */ /* Check if we are in a connecting state */
if(s->state==SSH_SOCKET_CONNECTING){ if(s->state==SSH_SOCKET_CONNECTING){
@ -163,7 +167,7 @@ int ssh_socket_pollcallback(ssh_poll_handle p, socket_t fd, int revents, void *v
if(s->callbacks && s->callbacks->connected) if(s->callbacks && s->callbacks->connected)
s->callbacks->connected(SSH_SOCKET_CONNECTED_ERROR,err, s->callbacks->connected(SSH_SOCKET_CONNECTED_ERROR,err,
s->callbacks->userdata); s->callbacks->userdata);
return 0; return -1;
} }
/* Then we are in a more standard kind of error */ /* Then we are in a more standard kind of error */
/* force a read to get an explanation */ /* force a read to get an explanation */
@ -173,7 +177,8 @@ int ssh_socket_pollcallback(ssh_poll_handle p, socket_t fd, int revents, void *v
s->data_to_read=1; s->data_to_read=1;
r=ssh_socket_unbuffered_read(s,buffer,sizeof(buffer)); r=ssh_socket_unbuffered_read(s,buffer,sizeof(buffer));
if(r<0){ if(r<0){
if(p != NULL) err=-1;
if(p != NULL)
ssh_poll_set_events(p,ssh_poll_get_events(p) & ~POLLIN); ssh_poll_set_events(p,ssh_poll_get_events(p) & ~POLLIN);
if(s->callbacks && s->callbacks->exception){ if(s->callbacks && s->callbacks->exception){
s->callbacks->exception( s->callbacks->exception(
@ -230,7 +235,7 @@ int ssh_socket_pollcallback(ssh_poll_handle p, socket_t fd, int revents, void *v
ssh_poll_remove_events(p,POLLOUT); ssh_poll_remove_events(p,POLLOUT);
/* TODO: Find a way to put back POLLOUT when buffering occurs */ /* TODO: Find a way to put back POLLOUT when buffering occurs */
} }
return 0; return err;
} }
/** @internal /** @internal