diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-10-30 12:11:35 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-10-30 12:11:35 +0300 |
| commit | fad75a54d4da2c9f399f3ee585b640b91a5cfe77 (patch) | |
| tree | 35742a6ab69c37e125f53ee7f62ebd58b9122fd7 /Zend/zend_execute_API.c | |
| parent | 8203a0668d1ec4d667336f8f3be469873d740911 (diff) | |
| parent | e4a8b7a4b6f29fbaf18b6c4695b52114dff4b60c (diff) | |
| download | php-git-fad75a54d4da2c9f399f3ee585b640b91a5cfe77.tar.gz | |
Merge branch 'master' into rc_debug
* master: (26 commits)
Better fix for bug #75451 (Assertion fails while foreach on empty xpath query)
Catch with the latest AppVeyor unzip errors
Fixed type inference
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
Fix compiler warnings
We don't use a specific model for a MAKERNOTE so remove these checks that doesn't do anything anyway
Remove these old comments, as for the TODO, there is already a FR for this
Re-enable AppVeyor cache
make sure run-tests reports exit status upon prerequisite error
Remove implicit constants from test case
Fix invalid read in zend_use_undefined_constant()
Fix invalid read in mb_ord()
Remove --with-libmbfl configure option
Fixed bug #75451 (Assertion fails while foreach on empty xpath query)
Add tests for UConverter::getStandards()
convert spaces to tabs in ext/ftp/tests/server.inc
Add tests for ftp_rename
Fix bug #75434 Wrong reflection for mysqli_fetch_all function
Don't optimize input arrays with suffix holes
Fix bug #75307 Wrong reflection for openssl_open function
...
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 cbdf6224fb..d159305c96 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -568,8 +568,9 @@ ZEND_API int zend_use_undefined_constant(zend_string *name, zend_ast_attr attr, if (EG(exception)) { return FAILURE; } else { + zend_string *result_str = zend_string_init(actual, actual_len, 0); zval_ptr_dtor_nogc(result); - ZVAL_STRINGL(result, actual, actual_len); + ZVAL_NEW_STR(result, result_str); } } return SUCCESS; |