diff options
author | djm <djm> | 2011-11-25 02:53:48 +0000 |
---|---|---|
committer | djm <djm> | 2011-11-25 02:53:48 +0000 |
commit | 28bd32c422e2b477f54808d82de5dbbb23eaa892 (patch) | |
tree | de92bd9ada60cb8191b631b5cfa8c1a1f719ad86 | |
parent | d806913c0b946b937cd81f4164378a4085b67069 (diff) | |
download | openssh-28bd32c422e2b477f54808d82de5dbbb23eaa892.tar.gz |
- 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@
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sftp.c | 6 |
2 files changed, 12 insertions, 2 deletions
@@ -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@ @@ -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); |