diff options
| -rw-r--r-- | ext/standard/php_string.h | 2 | ||||
| -rw-r--r-- | ext/standard/string.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index f54f633b08..4b98d910d9 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -149,6 +149,6 @@ PHPAPI char *php_strerror(int errnum); #endif void register_string_constants(INIT_FUNC_ARGS); -int php_charmask(unsigned char *input, int len, char *mask); +int php_charmask(unsigned char *input, int len, char *mask TSRMLS_DC); #endif /* PHP_STRING_H */ diff --git a/ext/standard/string.c b/ext/standard/string.c index 8dd300951a..bcbdccda9a 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -408,7 +408,7 @@ PHP_FUNCTION(strcoll) * it needs to be incrementing. * Returns: FAILURE/SUCCESS wether the input was correct (i.e. no range errors) */ -int php_charmask(unsigned char *input, int len, char *mask) +int php_charmask(unsigned char *input, int len, char *mask TSRMLS_DC) { unsigned char *end; unsigned char c; @@ -470,6 +470,8 @@ PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode) what indicates which chars are to be trimmed. NULL->default (' \t\n\r\v\0') */ { + TSRMLS_FETCH(); + register int i; int len = str->value.str.len; int trimmed = 0; @@ -477,9 +479,9 @@ PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode) char mask[256]; if (what) { - php_charmask(what->value.str.val, what->value.str.len, mask); + php_charmask(what->value.str.val, what->value.str.len, mask TSRMLS_CC); } else { - php_charmask(" \n\r\t\v\0", 6, mask); + php_charmask(" \n\r\t\v\0", 6, mask TSRMLS_CC); } if (mode & 1) { |