Browse Source

fgetss/gzgetss fixes

experimetnal/RETURN_REF_PATCH
Rasmus Lerdorf 27 years ago
parent
commit
cd0957112b
  1. 3
      ext/standard/file.c
  2. 2
      ext/standard/string.c
  3. 3
      ext/zlib/zlib.c

3
ext/standard/file.c

@ -973,7 +973,8 @@ PHP_FUNCTION(fgetss)
RETURN_FALSE;
}
_php3_strip_tags(buf, len, fgetss_state, allow->value.str.val);
/* strlen() can be used here since we are doing it on the return of an fgets() anyway */
_php3_strip_tags(buf, strlen(buf), fgetss_state, allow?allow->value.str.val:NULL);
RETURN_STRING(buf, 0);
}
/* }}} */

2
ext/standard/string.c

@ -1789,7 +1789,7 @@ PHP_FUNCTION(strip_tags)
}
convert_to_string(str);
buf = estrdup(str->value.str.val);
_php3_strip_tags(buf, str->value.str.len, 0, allow->value.str.val);
_php3_strip_tags(buf, str->value.str.len, 0, allow?allow->value.str.val:NULL);
RETURN_STRING(buf, 0);
}
/* }}} */

3
ext/zlib/zlib.c

@ -518,7 +518,8 @@ PHP_FUNCTION(gzgetss)
RETURN_FALSE;
}
_php3_strip_tags(buf, len, ZLIBG(gzgetss_state), allow->value.str.val);
/* strlen() can be used here since we are doing it on the return of an fgets() anyway */
_php3_strip_tags(buf, strlen, ZLIBG(gzgetss_state), allow?allow->value.str.val:NULL);
RETURN_STRING(buf, 0);
}

Loading…
Cancel
Save