jani Wed Aug 22 14:59:45 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard dir.c
/php-src NEWS
Log:
MFH:- Fixed bug #42365 (glob() crashes with invalid flags)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.9&r2=1.147.2.3.2.10&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.9
php-src/ext/standard/dir.c:1.147.2.3.2.10
--- php-src/ext/standard/dir.c:1.147.2.3.2.9 Mon Jul 16 20:29:21 2007
+++ php-src/ext/standard/dir.c Wed Aug 22 14:59:44 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.147.2.3.2.9 2007/07/16 20:29:21 tony2001 Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.10 2007/08/22 14:59:44 jani Exp $ */
/* {{{ includes/startup/misc */
@@ -141,34 +141,56 @@
REGISTER_STRING_CONSTANT("PATH_SEPARATOR", pathsep_str,
CONST_CS|CONST_PERSISTENT);
#ifdef HAVE_GLOB
+
#ifdef GLOB_BRACE
REGISTER_LONG_CONSTANT("GLOB_BRACE", GLOB_BRACE, CONST_CS |
CONST_PERSISTENT);
+#else
+# define GLOB_BRACE 0
#endif
+
#ifdef GLOB_MARK
REGISTER_LONG_CONSTANT("GLOB_MARK", GLOB_MARK, CONST_CS |
CONST_PERSISTENT);
+#else
+# define GLOB_MARK 0
#endif
+
#ifdef GLOB_NOSORT
REGISTER_LONG_CONSTANT("GLOB_NOSORT", GLOB_NOSORT, CONST_CS |
CONST_PERSISTENT);
+#else
+# define GLOB_NOSORT 0
#endif
+
#ifdef GLOB_NOCHECK
REGISTER_LONG_CONSTANT("GLOB_NOCHECK", GLOB_NOCHECK, CONST_CS |
CONST_PERSISTENT);
+#else
+# define GLOB_NOCHECK 0
#endif
+
#ifdef GLOB_NOESCAPE
REGISTER_LONG_CONSTANT("GLOB_NOESCAPE", GLOB_NOESCAPE, CONST_CS |
CONST_PERSISTENT);
+#else
+# define GLOB_NOESCAPE 0
#endif
+
#ifdef GLOB_ERR
REGISTER_LONG_CONSTANT("GLOB_ERR", GLOB_ERR, CONST_CS |
CONST_PERSISTENT);
+#else
+# define GLOB_ERR 0
#endif
#ifndef GLOB_ONLYDIR
-#define GLOB_ONLYDIR (1<<30)
-#define GLOB_EMULATE_ONLYDIR
-#define GLOB_FLAGMASK (~GLOB_ONLYDIR)
+# define GLOB_ONLYDIR (1<<30)
+# define GLOB_EMULATE_ONLYDIR
+# define GLOB_FLAGMASK (~GLOB_ONLYDIR)
#else
-#define GLOB_FLAGMASK (~0)
+# define GLOB_FLAGMASK (~0)
#endif
+/* This is used for checking validity of passed flags (passing invalid flags
causes segfault in glob()!! */
+#define GLOB_AVAILABLE_FLAGS (0 | GLOB_BRACE | GLOB_MARK | GLOB_NOSORT |
GLOB_NOCHECK | GLOB_NOESCAPE | GLOB_ERR | GLOB_ONLYDIR)
+
REGISTER_LONG_CONSTANT("GLOB_ONLYDIR", GLOB_ONLYDIR, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("GLOB_AVAILABLE_FLAGS", GLOB_AVAILABLE_FLAGS,
CONST_CS | CONST_PERSISTENT);
#endif /* HAVE_GLOB */
@@ -375,8 +397,14 @@
int n;
int ret;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &pattern,
&pattern_len, &flags) == FAILURE)
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &pattern,
&pattern_len, &flags) == FAILURE) {
return;
+ }
+
+ if ((GLOB_AVAILABLE_FLAGS & flags) != flags) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "At least one of
the passed flags is invalid or not supported on this platform");
+ RETURN_FALSE;
+ }
#ifdef ZTS
if (!IS_ABSOLUTE_PATH(pattern, pattern_len)) {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.904&r2=1.2027.2.547.2.905&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.904 php-src/NEWS:1.2027.2.547.2.905
--- php-src/NEWS:1.2027.2.547.2.904 Wed Aug 22 14:18:09 2007
+++ php-src/NEWS Wed Aug 22 14:59:45 2007
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Aug 2007, PHP 5.2.4
+- Fixed bug #42365 (glob() crashes and/or accepts way too many flags). (Jani)
- Fixed bug #42183 (classmap cause crashr in non-wsdl mode). (Dmitry)
- Fixed bug #42009 (is_a() and is_subclass_of() should NOT call autoload,
in the same way as "instanceof" operator). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
