From: dtucker <dtucker>
Date: Sun, 2 Dec 2007 12:12:30 +0000 (+0000)
Subject:    - djm@cvs.openbsd.org 2007/11/03 00:36:14
X-Git-Tag: V_4_9_P1~102
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/169123191369b445952a7327d3bef40bb14728ff

   - djm@cvs.openbsd.org 2007/11/03 00:36:14
     [clientloop.c]
     fix memory leak in process_cmdline(), patch from Jan.Pechanec AT Sun.COM;
     ok dtucker@
---

diff --git a/ChangeLog b/ChangeLog
index 560b3dcd..4774575d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,10 @@
    - jmc@cvs.openbsd.org 2007/10/29 07:48:19
      [ssh_config.5]
      clean up after previous macro removal;
+   - djm@cvs.openbsd.org 2007/11/03 00:36:14
+     [clientloop.c]
+     fix memory leak in process_cmdline(), patch from Jan.Pechanec AT Sun.COM;
+     ok dtucker@
 
 20071030
  - (djm) OpenBSD CVS Sync
diff --git a/clientloop.c b/clientloop.c
index 7a61cb74..ba53de48 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.182 2007/09/04 03:21:03 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.183 2007/11/03 00:36:14 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -953,6 +953,9 @@ process_cmdline(void)
 	u_short cancel_port;
 	Forward fwd;
 
+	bzero(&fwd, sizeof(fwd));
+	fwd.listen_host = fwd.connect_host = NULL;
+
 	leave_raw_mode();
 	handler = signal(SIGINT, SIG_IGN);
 	cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
@@ -1052,6 +1055,10 @@ out:
 	enter_raw_mode();
 	if (cmd)
 		xfree(cmd);
+	if (fwd.listen_host != NULL)
+		xfree(fwd.listen_host);
+	if (fwd.connect_host != NULL)
+		xfree(fwd.connect_host);
 }
 
 /* process the characters one by one */