RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2010/01/09 11:13:02 

[sftp.c]
     Prevent sftp from derefing a null pointer when given a "-" without a
     command.  Also, allow whitespace to follow a "-".  bz#1691, path from
     Colin Watson via Debian.  ok djm@ deraadt@
This commit is contained in:
Darren Tucker 2010-01-09 22:28:03 +11:00
parent 4b28251df4
commit 70cc092817
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -23,6 +23,11 @@
- dtucker@cvs.openbsd.org 2010/01/09 05:17:00 - dtucker@cvs.openbsd.org 2010/01/09 05:17:00
[roaming_client.c] [roaming_client.c]
Remove a PRIu64 format string that snuck in with roaming. ok djm@ Remove a PRIu64 format string that snuck in with roaming. ok djm@
- dtucker@cvs.openbsd.org 2010/01/09 11:13:02
[sftp.c]
Prevent sftp from derefing a null pointer when given a "-" without a
command. Also, allow whitespace to follow a "-". bz#1691, path from
Colin Watson via Debian. ok djm@ deraadt@
20091208 20091208
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync

11
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.117 2010/01/08 21:50:49 dtucker Exp $ */ /* $OpenBSD: sftp.c,v 1.118 2010/01/09 11:13:02 dtucker Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -1112,17 +1112,18 @@ parse_args(const char **cpp, int *pflag, int *rflag, int *lflag, int *iflag,
/* Skip leading whitespace */ /* Skip leading whitespace */
cp = cp + strspn(cp, WHITESPACE); cp = cp + strspn(cp, WHITESPACE);
/* Ignore blank lines and lines which begin with comment '#' char */
if (*cp == '\0' || *cp == '#')
return (0);
/* Check for leading '-' (disable error processing) */ /* Check for leading '-' (disable error processing) */
*iflag = 0; *iflag = 0;
if (*cp == '-') { if (*cp == '-') {
*iflag = 1; *iflag = 1;
cp++; cp++;
cp = cp + strspn(cp, WHITESPACE);
} }
/* Ignore blank lines and lines which begin with comment '#' char */
if (*cp == '\0' || *cp == '#')
return (0);
if ((argv = makeargv(cp, &argc, 0, NULL, NULL)) == NULL) if ((argv = makeargv(cp, &argc, 0, NULL, NULL)) == NULL)
return -1; return -1;