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

Fix doublefree happening after a negociation error

Browse Source 
Fix the cherry-pick merge
Conflicts:

	libssh/client.c
This commit is contained in:
Aris Adamantiadis
2010-04-14 21:14:32 +02:00
parent 250273cf1a
commit 6ffd38d25e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libssh/client.c
View File

@@ -287,6 +287,7 @@ SSH_PACKET_CALLBACK(ssh_packet_dh_reply){
goto error; goto error;
} }
session->dh_server_signature = signature; session->dh_server_signature = signature;
signature=NULL; /* ownership changed */
if (dh_build_k(session) < 0) { if (dh_build_k(session) < 0) {
ssh_set_error(session, SSH_FATAL, "Cannot build k number"); ssh_set_error(session, SSH_FATAL, "Cannot build k number");
goto error; goto error;
@@ -453,10 +454,6 @@ error:
string_burn(f); string_burn(f);
string_free(f); string_free(f);
} }
if(pubkey != NULL){
string_burn(pubkey);
string_free(pubkey);
}
if(signature != NULL){ if(signature != NULL){
string_burn(signature); string_burn(signature);
string_free(signature); string_free(signature);