tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Always initialize 2nd arg to hpdelim2. It populates that

Browse Source 
*ONLY IF* there's a delimiter.  If there's not (the common case) it checked
uninitialized memory, which usually passed, but if not would cause spurious
failures when the uninitialized memory happens to contain "/".  ok deraadt.

OpenBSD-Commit-ID: 4291611eaf2a53d4c92f4a57c7f267c9f944e0d3
This commit is contained in:
dtucker@openbsd.org 2019-01-24 02:34:52 +00:00 committed by Darren Tucker
parent d05ea25567
commit 281ce04257
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servconf.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.347 2019/01/23 21:50:56 dtucker Exp $ */ /* $OpenBSD: servconf.c,v 1.348 2019/01/24 02:34:52 dtucker Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -896,6 +896,7 @@ process_permitopen_list(struct ssh *ssh, ServerOpCodes opcode,
/* Otherwise treat it as a list of permitted host:port */ /* Otherwise treat it as a list of permitted host:port */
for (i = 0; i < num_opens; i++) { for (i = 0; i < num_opens; i++) {
oarg = arg = xstrdup(opens[i]); oarg = arg = xstrdup(opens[i]);
ch = '\0';
host = hpdelim2(&arg, &ch); host = hpdelim2(&arg, &ch);
if (host == NULL || ch == '/') if (host == NULL || ch == '/')
fatal("%s: missing host in %s", __func__, what); fatal("%s: missing host in %s", __func__, what);
@ -1214,7 +1215,7 @@ process_server_config_line(ServerOptions *options, char *line,
const char *filename, int linenum, int *activep, const char *filename, int linenum, int *activep,
struct connection_info *connectinfo) struct connection_info *connectinfo)
{ {
char *cp, ***chararrayptr, **charptr, *arg, *arg2, *p; char ch, *cp, ***chararrayptr, **charptr, *arg, *arg2, *p;
int cmdline = 0, *intptr, value, value2, n, port; int cmdline = 0, *intptr, value, value2, n, port;
SyslogFacility *log_facility_ptr; SyslogFacility *log_facility_ptr;
LogLevel *log_level_ptr; LogLevel *log_level_ptr;
@ -1314,8 +1315,8 @@ process_server_config_line(ServerOptions *options, char *line,
port = 0; port = 0;
p = arg; p = arg;
} else { } else {
char ch;
arg2 = NULL; arg2 = NULL;
ch = '\0';
p = hpdelim2(&arg, &ch); p = hpdelim2(&arg, &ch);
if (p == NULL || ch == '/') if (p == NULL || ch == '/')
fatal("%s line %d: bad address:port usage", fatal("%s line %d: bad address:port usage",
@ -1944,9 +1945,8 @@ process_server_config_line(ServerOptions *options, char *line,
*/ */
xasprintf(&arg2, "*:%s", arg); xasprintf(&arg2, "*:%s", arg);
} else { } else {
char ch;
arg2 = xstrdup(arg); arg2 = xstrdup(arg);
ch = '\0';
p = hpdelim2(&arg, &ch); p = hpdelim2(&arg, &ch);
if (p == NULL || ch == '/') { if (p == NULL || ch == '/') {
fatal("%s line %d: missing host in %s", fatal("%s line %d: missing host in %s",