tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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@
This commit is contained in:
Damien Miller 2011-11-25 13:53:48 +11:00
parent 4a725ef6a5
commit 47d8115e53
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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 20111121
- (dtucker) [configure.ac] Set _FORTIFY_SOURCE. ok djm@ - (dtucker) [configure.ac] Set _FORTIFY_SOURCE. ok djm@

6
sftp.c
View File

@ -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> * 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; list[count] = NULL;
if (count == 0) if (count == 0) {
xfree(list);
return 0; return 0;
}
/* Complete ambigious command */ /* Complete ambigious command */
tmp = complete_ambiguous(cmd, list, count); tmp = complete_ambiguous(cmd, list, count);