com php-src: This should never fail: ext/spl/php_spl.c

From: Date: Wed, 23 Dec 2015 15:52:24 +0000
Subject: com php-src: This should never fail: ext/spl/php_spl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90417@lists.php.net to get a copy of this message
Commit: 9cc4cdbe574112885cb85f6eaf4014616959bfbd Author: Xinchen Hui <laruence@gmail.com> Wed, 23 Dec 2015 07:52:24 -0800 Parents: e21cb2daeabe459db996407df2113bb47a320937 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9cc4cdbe574112885cb85f6eaf4014616959bfbd Log: This should never fail Changed paths: M ext/spl/php_spl.c Diff: diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index b2f5932..719a9f3 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -425,9 +425,7 @@ PHP_FUNCTION(spl_autoload_call) zend_str_tolower_copy(ZSTR_VAL(lc_name), Z_STRVAL_P(class_name), Z_STRLEN_P(class_name)); zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions), &pos); while (zend_hash_get_current_key_ex(SPL_G(autoload_functions), &func_name, &num_idx, &pos) == HASH_KEY_IS_STRING) { - if ((alfi = zend_hash_get_current_data_ptr_ex(SPL_G(autoload_functions), &pos)) == NULL) { - continue; - } + alfi = zend_hash_get_current_data_ptr_ex(SPL_G(autoload_functions), &pos); zend_call_method(Z_ISUNDEF(alfi->obj)? NULL : &alfi->obj, alfi->ce, &alfi->func_ptr, ZSTR_VAL(func_name), ZSTR_LEN(func_name), retval, 1, class_name, NULL); zend_exception_save(); if (retval) {

« previous php.cvs (#90417) next »