sas Thu Apr 3 13:11:04 2003 EDT
Modified files: (Branch: PHP_4)
/php4/ext/standard basic_functions.c
Log:
MFH
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.543.2.5.2.1
php4/ext/standard/basic_functions.c:1.543.2.5.2.2
--- php4/ext/standard/basic_functions.c:1.543.2.5.2.1 Tue Apr 1 05:02:52 2003
+++ php4/ext/standard/basic_functions.c Thu Apr 3 13:11:03 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.543.2.5.2.1 2003/04/01 10:02:52 sas Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.5.2.2 2003/04/03 18:11:03 sas Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2117,7 +2117,12 @@
if (zend_get_parameters_array(ht, shutdown_function_entry.arg_count,
shutdown_function_entry.arguments) == FAILURE) {
RETURN_FALSE;
}
- convert_to_string(shutdown_function_entry.arguments[0]);
+
+ /* Prevent entering of anything but arrays/strings */
+ if (Z_TYPE_P(shutdown_function_entry.arguments[0]) != IS_ARRAY) {
+ convert_to_string(shutdown_function_entry.arguments[0]);
+ }
+
if (!BG(user_shutdown_function_names)) {
ALLOC_HASHTABLE(BG(user_shutdown_function_names));
zend_hash_init(BG(user_shutdown_function_names), 0, NULL, (void
(*)(void *)) user_shutdown_function_dtor, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
