moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-10 11:35:07 -05:00
Code Issues Releases Wiki Activity

ssh.c: fix memory leaks triggered upon OOM or other failures

Browse Source
This commit is contained in:
Yang Tse 2011-09-07 01:26:43 +02:00
parent 6539047694
commit 5658aa9574
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/ssh.c
View File

@ -2388,10 +2388,39 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
} }
sshc->ssh_session = NULL; sshc->ssh_session = NULL;
} }
/* worst-case scenario cleanup */
DEBUGASSERT(sshc->ssh_session == NULL);
DEBUGASSERT(sshc->ssh_channel == NULL);
DEBUGASSERT(sshc->sftp_session == NULL);
DEBUGASSERT(sshc->sftp_handle == NULL);
#ifdef HAVE_LIBSSH2_KNOWNHOST_API
DEBUGASSERT(sshc->kh == NULL);
#endif
Curl_safefree(sshc->rsa_pub);
Curl_safefree(sshc->rsa);
Curl_safefree(sshc->quote_path1);
Curl_safefree(sshc->quote_path2);
Curl_safefree(sshc->homedir);
Curl_safefree(sshc->readdir_filename);
Curl_safefree(sshc->readdir_longentry);
Curl_safefree(sshc->readdir_line);
Curl_safefree(sshc->readdir_linkPath);
/* the code we are about to return */
result = sshc->actualcode;
memset(sshc, 0, sizeof(struct ssh_conn));
conn->bits.close = TRUE; conn->bits.close = TRUE;
sshc->state = SSH_SESSION_FREE; /* current */
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
state(conn, SSH_STOP); state(conn, SSH_STOP);
result = sshc->actualcode;
break; break;
case SSH_QUIT: case SSH_QUIT: