com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/spl/spl _directory.c

Commit: c0150950425710bc84249c38fb09a9031f19fba0 Author: Christoph M. Becker <cmb@php.net> Tue, 5 Jul 2016 16:43:39 +0200 Parents: f22bc6438dcaf55bf80e7be972f3374d31dbaae5 4c24f170ea3701c9aadde6c575a777ee4027f463 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c0150950425710bc84249c38fb09a9031f19fba0 Log: Merge branch 'PHP-5.6' into PHP-7.0 # Resolved conflicts: # ext/spl/spl_directory.c Changed paths: MM ext/spl/spl_directory.c Diff: diff --cc ext/spl/spl_directory.c index 412fc54,8613c93...6a49d97 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@@ -653,19 -662,17 +653,19 @@@ static HashTable *spl_filesystem_object } /* }}} */ -zend_function *spl_filesystem_object_get_method_check(zval **object_ptr, char *method, int method_len, const struct _zend_literal *key TSRMLS_DC) /* {{{ */ +zend_function *spl_filesystem_object_get_method_check(zend_object **object, zend_string *method, const zval *key) /* {{{ */ { - spl_filesystem_object *fsobj = zend_object_store_get_object(*object_ptr TSRMLS_CC); + spl_filesystem_object *fsobj = spl_filesystem_from_obj(*object); - if (fsobj->u.dir.entry.d_name[0] == '\0' && fsobj->orig_path == NULL) { + if (fsobj->u.dir.dirp == NULL && fsobj->orig_path == NULL) { - method = "_bad_state_ex"; - method_len = sizeof("_bad_state_ex") - 1; - key = NULL; + zend_function *func; + zend_string *tmp = zend_string_init("_bad_state_ex", sizeof("_bad_state_ex") - 1, 0); + func = zend_get_std_object_handlers()->get_method(object, tmp, NULL); + zend_string_release(tmp); + return func; } - return zend_get_std_object_handlers()->get_method(object_ptr, method, method_len, key TSRMLS_CC); + return zend_get_std_object_handlers()->get_method(object, method, key); } /* }}} */