From 0764c3101baf70ee368efa3ec42cfb5104e304e7 Mon Sep 17 00:00:00 2001 From: Melvyn Sopacua Date: Mon, 23 Dec 2002 18:33:46 +0000 Subject: [PATCH] Verify if gl_pathv is not NULL, which it is, when GLOB_NOMATCH isn't supported and there are no matches. # BSDi/Mac OSX are affected. --- ext/standard/dir.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 73374d0434..7778876c6e 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -400,6 +400,9 @@ PHP_FUNCTION(glob) /* we assume that any glob pattern will match files from one directory only so checking the dirname of the first match should be sufficient */ + if (!globbuf.gl_pathv) { + RETURN_FALSE; + } strncpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN); if (PG(safe_mode) && (!php_checkuid(cwd, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { RETURN_FALSE; -- 2.40.0