- djm@cvs.openbsd.org 2010/06/18 04:43:08

     [sftp-client.c]
     fix memory leak in do_realpath() error path; bz#1771, patch from
     anicka AT suse.cz

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b38b3ca08..6563597ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@
      [session.c]
      Missing check for chroot_director == "none" (we already checked against
      NULL); bz#1564 from Jan.Pechanec AT Sun.COM
+   - djm@cvs.openbsd.org 2010/06/18 04:43:08
+     [sftp-client.c]
+     fix memory leak in do_realpath() error path; bz#1771, patch from
+     anicka AT suse.cz
 
 20100622
  - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
diff --git a/sftp-client.c b/sftp-client.c
index 6124c0f40..408b29840 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.90 2009/10/11 10:41:26 dtucker Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.91 2010/06/18 04:43:08 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -713,7 +713,8 @@ do_realpath(struct sftp_conn *conn, char *path)
                 u_int status = buffer_get_int(&msg);
 
                 error("Couldn't canonicalise: %s", fx2txt(status));
-                return(NULL);
+                buffer_free(&msg);
+                return NULL;
         } else if (type != SSH2_FXP_NAME)
                 fatal("Expected SSH2_FXP_NAME(%u) packet, got %u",
                     SSH2_FXP_NAME, type);