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.4'

Browse source 
* PHP-7.4:
  Fix #73527: Invalid memory access in php_filter_strip
This commit is contained in:
Christoph M. Becker 2020-06-04 13:40:16 +02:00
commit 970ac28e27
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/filter/sanitizing_filters.c
View file

@ -98,7 +98,7 @@ static void php_filter_strip(zval *value, zend_long flags)
{
unsigned char *str;
size_t i;
int c;
size_t c;
zend_string *buf;
/* Optimization for if no strip flags are set */
@ -107,7 +107,7 @@ static void php_filter_strip(zval *value, zend_long flags)
}
str = (unsigned char *)Z_STRVAL_P(value);
buf = zend_string_alloc(Z_STRLEN_P(value) + 1, 0);
buf = zend_string_alloc(Z_STRLEN_P(value), 0);
c = 0;
for (i = 0; i < Z_STRLEN_P(value); i++) {
if ((str[i] >= 127) && (flags & FILTER_FLAG_STRIP_HIGH)) {
@ -149,7 +149,7 @@ static void filter_map_apply(zval *value, filter_map *map)
zend_string *buf;
str = (unsigned char *)Z_STRVAL_P(value);
buf = zend_string_alloc(Z_STRLEN_P(value) + 1, 0);
buf = zend_string_alloc(Z_STRLEN_P(value), 0);
c = 0;
for (i = 0; i < Z_STRLEN_P(value); i++) {
if ((*map)[str[i]]) {