diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-25 12:58:03 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-25 12:58:03 +0100 |
| commit | 1686d302e1eaed8c368e398b735473df37ad816c (patch) | |
| tree | a82d4acafdadeb1cfde0efb73a2c58974f5e2da4 /main/php_variables.c | |
| parent | fa6144b077519529f24aa794a033f399b98a12f1 (diff) | |
| parent | 846bea7f0524a28d3d57578bd457caede815e328 (diff) | |
| download | php-git-1686d302e1eaed8c368e398b735473df37ad816c.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'main/php_variables.c')
| -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 7dd5298af9..577917a007 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; |