diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-25 12:57:53 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-25 12:57:53 +0100 |
| commit | 846bea7f0524a28d3d57578bd457caede815e328 (patch) | |
| tree | 363a8056cfdeb2f0b1a49cbb72cc625511a09129 | |
| parent | 36fcc4cb5d92dabc8c8f6f0587c81093bcac878c (diff) | |
| parent | bbfa1b64192fe3ccd2898e6e1f997387b4f210d1 (diff) | |
| download | php-git-846bea7f0524a28d3d57578bd457caede815e328.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | main/php_variables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 3854c54880..69fe2c24f6 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -331,7 +331,7 @@ static inline int add_post_vars(zval *arr, post_var_data_t *vars, zend_bool eof) } } - if (!eof) { + if (!eof && ZSTR_VAL(vars->str.s) != vars->ptr) { memmove(ZSTR_VAL(vars->str.s), vars->ptr, ZSTR_LEN(vars->str.s) = vars->end - vars->ptr); } return SUCCESS; |