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

upstream: remove size_t gl_pathc < 0 test, it is invalid. the 

return value from glob() is sufficient. discussed with djm

OpenBSD-Commit-ID: c91203322db9caaf7efaf5ae90c794a91070be3c
This commit is contained in:
deraadt@openbsd.org 2019-11-13 05:42:26 +00:00 committed by Damien Miller
parent 72687c8e7c
commit 40598b85d7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.312 2019/11/13 04:47:52 deraadt Exp $ */ /* $OpenBSD: readconf.c,v 1.313 2019/11/13 05:42:26 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1559,12 +1559,12 @@ parse_keytypes:
"files",filename, linenum, arg2); "files",filename, linenum, arg2);
free(arg2); free(arg2);
continue; continue;
} else if (r != 0 || gl.gl_pathc < 0) } else if (r != 0)
fatal("%.200s line %d: glob failed for %s.", fatal("%.200s line %d: glob failed for %s.",
filename, linenum, arg2); filename, linenum, arg2);
free(arg2); free(arg2);
oactive = *activep; oactive = *activep;
for (i = 0; i < (u_int)gl.gl_pathc; i++) { for (i = 0; i < gl.gl_pathc; i++) {
debug3("%.200s line %d: Including file %s " debug3("%.200s line %d: Including file %s "
"depth %d%s", filename, linenum, "depth %d%s", filename, linenum,
gl.gl_pathv[i], depth, gl.gl_pathv[i], depth,