- 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 01090a4c053969d4d743a596ff9fb2604ef3d7a8..011b9efcd5fb62faf6c7c0662bfdaba9c9354c73 100644 (file)
--- 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 d676a377102d7b9381206f41b865a17d1806c8df..194d22710e1226616090abb68797e974c9ed4218 100644 (file)
--- 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)