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

session: Fix an infinite loop in the termination callback.

Browse Source 
This happened due to the use of the buggy and obsolete timeout
funtions.
(cherry picked from commit 7949f2cdc6)
This commit is contained in:
rofl0r
2011-08-10 01:44:47 +02:00
committed by Andreas Schneider
parent cbe8f8b760
commit d08554dabd
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/session.c
View File

@@ -492,23 +492,17 @@ int ssh_handle_packets(ssh_session session, int timeout) {
* @return SSH_OK on success, SSH_ERROR otherwise.
*/
int ssh_handle_packets_termination(ssh_session session, int timeout,
ssh_termination_function fct, void *user){
int ret = SSH_ERROR;
struct ssh_timestamp ts;
ssh_timestamp_init(&ts);
ssh_termination_function fct, void *user){
int ret = SSH_OK;
while(!fct(user)){
ret = ssh_handle_packets(session, timeout);
if(ret == SSH_ERROR)
return SSH_ERROR;
if(fct(user)) {
return SSH_OK;
} else if (ssh_timeout_elapsed(&ts, timeout)) {
return SSH_AGAIN;
}
timeout = ssh_timeout_update(&ts,timeout);
}
return ret;
while(!fct(user)){
ret = ssh_handle_packets(session, timeout);
if(ret == SSH_ERROR || ret == SSH_AGAIN)
return ret;
if(fct(user))
return SSH_OK;
}
return ret;
}
/**