diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-19 01:12:05 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-19 01:12:05 +0400 |
| commit | 557994d50d6d712a2a23ba0bbb3169750bf0a0cf (patch) | |
| tree | c13d2d259bd06a45d8e79d0f1b839304899e5c4a /Zend/zend_execute_API.c | |
| parent | 110e01a21eef8827a0c449f23139e25a9e32e181 (diff) | |
| download | php-git-557994d50d6d712a2a23ba0bbb3169750bf0a0cf.tar.gz | |
Use better data structures (incomplete)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 21958308a0..bf43338546 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1081,6 +1081,7 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, const zend_li EG(autoload_func) = fcall_cache.function_handler; zval_ptr_dtor(&args[0]); + zval_dtor(&fcall_info.function_name); zend_hash_del(EG(in_autoload), lc_name); @@ -1111,7 +1112,7 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s int retval; if (retval_ptr) { - ZVAL_STR(&pv, STR_ALLOC(str_len + sizeof("return ;"), 1)); + ZVAL_STR(&pv, STR_ALLOC(str_len + sizeof("return ;")-1, 1)); memcpy(Z_STRVAL(pv), "return ", sizeof("return ") - 1); memcpy(Z_STRVAL(pv) + sizeof("return ") - 1, str, str_len); Z_STRVAL(pv)[Z_STRLEN(pv) - 1] = ';'; |