From 6ffd38d25ecdfaf8e1a93dd3ee281e63d67ec139 Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Wed, 14 Apr 2010 21:14:32 +0200
Subject: Fix doublefree happening after a negociation error

Fix the cherry-pick merge
Conflicts:

	libssh/client.c
---
 libssh/client.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'libssh/client.c')

diff --git a/libssh/client.c b/libssh/client.c
index 75a0f67..d8ff685 100644
--- a/libssh/client.c
+++ b/libssh/client.c
@@ -287,6 +287,7 @@ SSH_PACKET_CALLBACK(ssh_packet_dh_reply){
     goto error;
   }
   session->dh_server_signature = signature;
+  signature=NULL; /* ownership changed */
   if (dh_build_k(session) < 0) {
     ssh_set_error(session, SSH_FATAL, "Cannot build k number");
     goto error;
@@ -453,10 +454,6 @@ error:
     string_burn(f);
     string_free(f);
   }
-  if(pubkey != NULL){
-    string_burn(pubkey);
-    string_free(pubkey);
-  }
   if(signature != NULL){
     string_burn(signature);
     string_free(signature);
-- 
cgit