2 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d55a397bf..760772d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+20111125
+ - OpenBSD CVS Sync
+   - oga@cvs.openbsd.org 2011/11/16 12:24:28
+     [sftp.c]
+     Don't leak list in complete_cmd_parse if there are no commands found.
+     Discovered when I was ``borrowing'' this code for something else.
+     ok djm@
+
 20111121
  - (dtucker) [configure.ac] Set _FORTIFY_SOURCE.  ok djm@
 
diff --git a/sftp.c b/sftp.c
index 5c03f89d7..da7fbab38 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.133 2011/09/22 06:29:03 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.134 2011/11/16 12:24:28 oga Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1631,8 +1631,10 @@ complete_cmd_parse(EditLine *el, char *cmd, int lastarg, char quote,
         }
         list[count] = NULL;
 
-        if (count == 0)
+        if (count == 0) {
+                xfree(list);
                 return 0;
+        }
 
         /* Complete ambigious command */
         tmp = complete_ambiguous(cmd, list, count);