diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-14 10:24:11 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-14 10:24:11 +0100 |
| commit | 93a221ec4bc7bb809c5e72689940d12d03f4a613 (patch) | |
| tree | aa494de8cacdab420f76ab1e2e41a8e65ab506a6 /ext/mbstring/mbstring.c | |
| parent | e089d506d5c7716c62cee5232d32ab22d0ddde26 (diff) | |
| parent | d6212835f2c21d6a0dc75bc25b636ce631bff38c (diff) | |
| download | php-git-93a221ec4bc7bb809c5e72689940d12d03f4a613.tar.gz | |
Merge branch 'PHP-7.3'
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 264c6020ca..17df6036dc 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -4953,11 +4953,9 @@ PHP_FUNCTION(mb_chr) /* }}} */ -static inline char* php_mb_scrub(const char* str, size_t str_len, const mbfl_encoding *enc) +static inline char* php_mb_scrub(const char* str, size_t str_len, const mbfl_encoding *enc, size_t *ret_len) { - size_t ret_len; - - return php_mb_convert_encoding_ex(str, str_len, enc, enc, &ret_len); + return php_mb_convert_encoding_ex(str, str_len, enc, enc, ret_len); } @@ -4969,6 +4967,7 @@ PHP_FUNCTION(mb_scrub) size_t str_len; zend_string *enc_name = NULL; char *ret; + size_t ret_len; ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_STRING(str, str_len) @@ -4981,13 +4980,13 @@ PHP_FUNCTION(mb_scrub) RETURN_FALSE; } - ret = php_mb_scrub(str, str_len, enc); + ret = php_mb_scrub(str, str_len, enc, &ret_len); if (ret == NULL) { RETURN_FALSE; } - RETVAL_STRING(ret); + RETVAL_STRINGL(ret, ret_len); efree(ret); } /* }}} */ |