archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1'

Browse source
This commit is contained in:
Nikita Popov 2017-02-02 18:07:27 +01:00
commit 7ae4fa8a03
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
main/php_variables.c
View file

@ -259,11 +259,14 @@ typedef struct post_var_data {
char *ptr;
char *end;
uint64_t cnt;
/* Bytes in ptr that have already been scanned for '&' */
size_t already_scanned;
} post_var_data_t;
static zend_bool add_post_var(zval *arr, post_var_data_t *var, zend_bool eof)
{
char *ksep, *vsep, *val;
char *start, *ksep, *vsep, *val;
size_t klen, vlen;
size_t new_vlen;
@ -271,9 +274,11 @@ static zend_bool add_post_var(zval *arr, post_var_data_t *var, zend_bool eof)
return 0;
}
vsep = memchr(var->ptr, '&', var->end - var->ptr);
start = var->ptr + var->already_scanned;
vsep = memchr(start, '&', var->end - start);
if (!vsep) {
if (!eof) {
var->already_scanned = var->end - var->ptr;
return 0;
} else {
vsep = var->end;
@ -306,6 +311,7 @@ static zend_bool add_post_var(zval *arr, post_var_data_t *var, zend_bool eof)
efree(val);
var->ptr = vsep + (vsep != var->end);
var->already_scanned = 0;
return 1;
}