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

- dtucker@cvs.openbsd.org 2012/09/18 10:36:12 

[sftp.c]
     Add bounds check on sftp tab-completion.  Part of a patch from from
     Jean-Marc Robert via tech@, ok djm
This commit is contained in:
Darren Tucker 2012-10-05 10:43:58 +10:00
parent 302889a1b0
commit 063018d9f6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -6,6 +6,10 @@
- markus@cvs.openbsd.org 2012/09/17 13:04:11 - markus@cvs.openbsd.org 2012/09/17 13:04:11
[packet.c] [packet.c]
clear old keys on rekeing; ok djm clear old keys on rekeing; ok djm
- dtucker@cvs.openbsd.org 2012/09/18 10:36:12
[sftp.c]
Add bounds check on sftp tab-completion. Part of a patch from from
Jean-Marc Robert via tech@, ok djm
20120917 20120917
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync

6
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.137 2012/09/17 09:54:44 djm Exp $ */ /* $OpenBSD: sftp.c,v 1.138 2012/09/18 10:36:12 dtucker Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -991,6 +991,10 @@ makeargv(const char *arg, int *argcp, int sloppy, char *lastquote,
state = MA_START; state = MA_START;
i = j = 0; i = j = 0;
for (;;) { for (;;) {
if (argc >= sizeof(argv) / sizeof(*argv)){
error("Too many arguments.");
return NULL;
}
if (isspace(arg[i])) { if (isspace(arg[i])) {
if (state == MA_UNQUOTED) { if (state == MA_UNQUOTED) {
/* Terminate current argument */ /* Terminate current argument */