From: djm <djm>
Date: Sun, 26 Mar 2006 02:51:44 +0000 (+0000)
Subject:    - djm@cvs.openbsd.org 2006/03/19 02:22:56
X-Git-Tag: V_4_4_P1~324
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/e6a3cfb50e1c2311471b7a64c6ca0549b3d933af

   - djm@cvs.openbsd.org 2006/03/19 02:22:56
     [sftp.c]
     more memory leaks detected by Coverity via elad AT netbsd.org;
     deraadt@ ok
---

diff --git a/ChangeLog b/ChangeLog
index 01090a4c..011b9efc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
      [serverloop.c]
      memory leaks detected by Coverity via elad AT netbsd.org;
      ok deraadt@ dtucker@
+   - djm@cvs.openbsd.org 2006/03/19 02:22:56
+     [sftp.c]
+     more memory leaks detected by Coverity via elad AT netbsd.org;
+     deraadt@ ok
 
 20060325
  - OpenBSD CVS Sync
diff --git a/sftp.c b/sftp.c
index d676a377..194d2271 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1289,6 +1289,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
 			if (parse_dispatch_command(conn, cmd, &pwd, 1) != 0) {
 				xfree(dir);
 				xfree(pwd);
+				xfree(conn);
 				return (-1);
 			}
 		} else {
@@ -1301,6 +1302,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
 			err = parse_dispatch_command(conn, cmd, &pwd, 1);
 			xfree(dir);
 			xfree(pwd);
+			xfree(conn);
 			return (err);
 		}
 		xfree(dir);
@@ -1365,6 +1367,7 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
 			break;
 	}
 	xfree(pwd);
+	xfree(conn);
 
 #ifdef USE_LIBEDIT
 	if (el != NULL)