diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-06-22 14:28:29 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-06-22 14:28:29 +0300 |
| commit | 3c600e2d61161b2db2c2e9b0e67b2cc8e93df906 (patch) | |
| tree | c275cb5bbb704d45f4599d41b6ad771736e318c9 | |
| parent | 9b2d708f21f96b1ac021cda9f89536083b5d6f50 (diff) | |
| download | php-git-3c600e2d61161b2db2c2e9b0e67b2cc8e93df906.tar.gz | |
retval shouldn't be NULL
| -rw-r--r-- | ext/spl/php_spl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 7cda285947..37d1ecfc7e 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -467,9 +467,11 @@ PHP_FUNCTION(spl_autoload_call) zend_fcall_info fcall_info; zend_fcall_info_cache fcall_cache; + ZVAL_UNDEF(&retval); + fcall_info.size = sizeof(fcall_info); - ZVAL_STR_COPY(&fcall_info.function_name, spl_autoload_fn->common.function_name); - fcall_info.retval = NULL; + ZVAL_UNDEF(&fcall_info.function_name); + fcall_info.retval = &retval; fcall_info.param_count = 1; fcall_info.params = class_name; fcall_info.object = NULL; @@ -480,7 +482,7 @@ PHP_FUNCTION(spl_autoload_call) fcall_cache.object = NULL; zend_call_function(&fcall_info, &fcall_cache); - zval_ptr_dtor(&fcall_info.function_name); + zval_ptr_dtor(&retval); } } /* }}} */ |