shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix a race condition bug in ssh_scp_close()

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-03-01 19:51:07 +01:00
parent 56dfa69fc9
commit 370d072eba
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libssh/scp.c
View File

@@ -26,7 +26,6 @@
#include "libssh/priv.h" #include "libssh/priv.h"
#include "libssh/scp.h" #include "libssh/scp.h"
/** @defgroup ssh_scp SSH-scp /** @defgroup ssh_scp SSH-scp
* @brief SCP protocol over SSH functions * @brief SCP protocol over SSH functions
* @addtogroup ssh_scp * @addtogroup ssh_scp
@@ -118,11 +117,22 @@ int ssh_scp_init(ssh_scp scp){
} }
int ssh_scp_close(ssh_scp scp){ int ssh_scp_close(ssh_scp scp){
char buffer[128];
int err;
if(scp->channel != NULL){ if(scp->channel != NULL){
if(channel_send_eof(scp->channel) == SSH_ERROR){ if(channel_send_eof(scp->channel) == SSH_ERROR){
scp->state=SSH_SCP_ERROR; scp->state=SSH_SCP_ERROR;
return SSH_ERROR; return SSH_ERROR;
} }
/* avoid situations where data are buffered and
* not yet stored on disk. This can happen if the close is sent
* before we got the EOF back
*/
while(!channel_is_eof(scp->channel)){
err=channel_read(scp->channel,buffer,sizeof(buffer),0);
if(err==SSH_ERROR)
break;
}
if(channel_close(scp->channel) == SSH_ERROR){ if(channel_close(scp->channel) == SSH_ERROR){
scp->state=SSH_SCP_ERROR; scp->state=SSH_SCP_ERROR;
return SSH_ERROR; return SSH_ERROR;