mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Removed extra byte
This commit is contained in:
parent
c021824fc1
commit
36be62c0e1
@ -362,7 +362,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
|
|||||||
/* FIXME: Should not use php_register_variable_ex as that also registers
|
/* FIXME: Should not use php_register_variable_ex as that also registers
|
||||||
* globals when register_globals is turned on */
|
* globals when register_globals is turned on */
|
||||||
Z_STRLEN(raw_var) = val_len;
|
Z_STRLEN(raw_var) = val_len;
|
||||||
Z_STRVAL(raw_var) = estrndup(*val, val_len + 1);
|
Z_STRVAL(raw_var) = estrndup(*val, val_len);
|
||||||
Z_TYPE(raw_var) = IS_STRING;
|
Z_TYPE(raw_var) = IS_STRING;
|
||||||
|
|
||||||
php_register_variable_ex(var, &raw_var, array_ptr TSRMLS_CC);
|
php_register_variable_ex(var, &raw_var, array_ptr TSRMLS_CC);
|
||||||
@ -376,7 +376,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
|
|||||||
Z_TYPE(new_var) = IS_STRING;
|
Z_TYPE(new_var) = IS_STRING;
|
||||||
|
|
||||||
if (!(IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
|
if (!(IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
|
||||||
Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
|
Z_STRVAL(new_var) = estrndup(*val, val_len);
|
||||||
php_zval_filter(&new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL/*charset*/ TSRMLS_CC);
|
php_zval_filter(&new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL/*charset*/ TSRMLS_CC);
|
||||||
}
|
}
|
||||||
#if PHP_VERSION_ID<60000
|
#if PHP_VERSION_ID<60000
|
||||||
@ -385,7 +385,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else {
|
else {
|
||||||
Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
|
Z_STRVAL(new_var) = estrndup(*val, val_len);
|
||||||
}
|
}
|
||||||
} else { /* empty string */
|
} else { /* empty string */
|
||||||
ZVAL_EMPTY_STRING(&new_var);
|
ZVAL_EMPTY_STRING(&new_var);
|
||||||
@ -404,7 +404,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
|
|||||||
}
|
}
|
||||||
efree(*val);
|
efree(*val);
|
||||||
if (Z_STRLEN(new_var)) {
|
if (Z_STRLEN(new_var)) {
|
||||||
*val = estrndup(Z_STRVAL(new_var), Z_STRLEN(new_var) + 1);
|
*val = estrndup(Z_STRVAL(new_var), Z_STRLEN(new_var));
|
||||||
} else {
|
} else {
|
||||||
*val = estrdup("");
|
*val = estrdup("");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user