cvs: php-src(PHP_5_1) /ext/spl php_spl.c
| From: | Marcus Boerger | Date: | Thu, 03 Nov 2005 21:28:43 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/spl php_spl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34989@lists.php.net to get a copy of this message | ||
helly Thu Nov 3 16:28:43 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl php_spl.c
Log:
- MFH Add missing check
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.52.2.11&r2=1.52.2.12&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.11 php-src/ext/spl/php_spl.c:1.52.2.12
--- php-src/ext/spl/php_spl.c:1.52.2.11 Wed Nov 2 15:31:01 2005
+++ php-src/ext/spl/php_spl.c Thu Nov 3 16:28:43 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.52.2.11 2005/11/02 20:31:01 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.12 2005/11/03 21:28:43 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -404,7 +404,7 @@
if (!zend_is_callable_ex(zcallable, 0, &func_name, &func_name_len, &alfi.ce,
&alfi.func_ptr, &obj_ptr TSRMLS_CC)) {
if (Z_TYPE_P(zcallable) == IS_ARRAY) {
- if (!obj_ptr && !(alfi.func_ptr->common.fn_flags & ZEND_ACC_STATIC)) {
+ if (!obj_ptr && alfi.func_ptr && !(alfi.func_ptr->common.fn_flags &
ZEND_ACC_STATIC)) {
if (do_throw) {
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Passed array specifies a
non static method but no object");
}