diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-10-27 14:59:09 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-10-27 14:59:09 +0300 |
| commit | 8203a0668d1ec4d667336f8f3be469873d740911 (patch) | |
| tree | aff15fec48100625df5be1d87440f8f197a5ed97 /Zend/zend_execute_API.c | |
| parent | 49ea143bbd8d0bfcd393d0b5308a5d7833fc087c (diff) | |
| parent | cf67a421e986b1020dd390a694185039b131ba7c (diff) | |
| download | php-git-8203a0668d1ec4d667336f8f3be469873d740911.tar.gz | |
Merge branch 'master' into rc_debug
* master:
Use per-request heap instead of system one
Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases
Makrk persistent resources and references with GC_PERSISTENT flag
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 2eb4d11920..cbdf6224fb 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1025,7 +1025,7 @@ ZEND_API int zend_eval_stringl(char *str, size_t str_len, zval *retval_ptr, char int retval; if (retval_ptr) { - ZVAL_NEW_STR(&pv, zend_string_alloc(str_len + sizeof("return ;")-1, 1)); + ZVAL_NEW_STR(&pv, zend_string_alloc(str_len + sizeof("return ;")-1, 0)); 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] = ';'; |