diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2002-04-23 08:07:19 +0000 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2002-04-23 08:07:19 +0000 |
| commit | e6780384ad62d3d9bacd79550823e3a6314c6f7f (patch) | |
| tree | 47503d578480338cdabc24d99d61b6d36027ae18 | |
| parent | 722cd4fa17d2f3be7a79fc36b61df65752ffdef1 (diff) | |
| download | php-git-e6780384ad62d3d9bacd79550823e3a6314c6f7f.tar.gz | |
Fix possible wide char prolem.
Fix empty output when no conversion is performed.
# Derick, this needs to be merged.
| -rw-r--r-- | ext/mbstring/mbstring.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 4245191be8..6c05cb62a4 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1539,8 +1539,7 @@ PHP_FUNCTION(mb_output_handler) MBSTRG(outconv) = NULL; } if (encoding == mbfl_no_encoding_pass) { - RETVAL_STRING(arg_string, 1); - return; + RETURN_STRINGL(arg_string, arg_string_len, 1); } /* if content-type is not yet set, set it and activate the converter */ if (SG(sapi_headers).send_default_content_type ) { @@ -1563,9 +1562,7 @@ PHP_FUNCTION(mb_output_handler) /* just return if the converter is not activated. */ if (MBSTRG(outconv) == NULL) { - zval_dtor(return_value); - Z_STRVAL_P(return_value) = arg_string; - zval_copy_ctor(return_value); + RETURN_STRINGL(arg_string, arg_string_len, 1); return; } |