Module Name: src
Committed By: riz
Date: Sun Jun 13 18:12:37 UTC 2010
Modified Files:
src/libexec/ftpd [netbsd-4]: popen.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1395):
libexec/ftpd/popen.c: revision 1.37
PR/43023: Bruce Cran: FTPD bug remote crash
Since we specify NOCHECK, in the NOMATCH case gl_pathv can be NULL.
(From FreeBSD)
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.4.1 src/libexec/ftpd/popen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ftpd/popen.c
diff -u src/libexec/ftpd/popen.c:1.31 src/libexec/ftpd/popen.c:1.31.4.1
--- src/libexec/ftpd/popen.c:1.31 Wed Feb 1 14:20:14 2006
+++ src/libexec/ftpd/popen.c Sun Jun 13 18:12:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: popen.c,v 1.31 2006/02/01 14:20:14 christos Exp $ */
+/* $NetBSD: popen.c,v 1.31.4.1 2010/06/13 18:12:36 riz Exp $ */
/*-
* Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
#if 0
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
#else
-__RCSID("$NetBSD: popen.c,v 1.31 2006/02/01 14:20:14 christos Exp $");
+__RCSID("$NetBSD: popen.c,v 1.31.4.1 2010/06/13 18:12:36 riz Exp $");
#endif
#endif /* not lint */
@@ -145,7 +145,8 @@
int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE|GLOB_LIMIT;
memset(&gl, 0, sizeof(gl));
- if (glob(argv[argc], flags, NULL, &gl)) {
+ if (glob(argv[argc], flags, NULL, &gl)
+ || gl.gl_pathv == NULL) {
if (sl_add(sl, ftpd_strdup(argv[argc])) == -1) {
globfree(&gl);
goto pfree;
