diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-02-26 12:06:29 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-02-26 12:06:29 +0800 |
| commit | 59acca2062d00f187f5066306f07e60ee3e87824 (patch) | |
| tree | 669da0c0c653598abe8628fec93c9729a3e626b1 | |
| parent | 6a584cf318a9265a55df69930a64122fcde46948 (diff) | |
| parent | 846bea7f0524a28d3d57578bd457caede815e328 (diff) | |
| download | php-git-59acca2062d00f187f5066306f07e60ee3e87824.tar.gz | |
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Improve fix for bug #73807
| -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; |