]> granicus.if.org Git - php/commitdiff
This should never fail
authorXinchen Hui <laruence@gmail.com>
Wed, 23 Dec 2015 15:52:24 +0000 (07:52 -0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 23 Dec 2015 15:52:24 +0000 (07:52 -0800)
ext/spl/php_spl.c

index b2f59328d2b3a7ade7f79fd5a044fe0ca2751634..719a9f3e48ca368d6cdef71b51f8ea344d0df1b4 100644 (file)
@@ -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) {