From 9bb299eb42ebbe9b4ea81a80829a6b2b91393a65 Mon Sep 17 00:00:00 2001 From: Moriyoshi Koizumi Date: Tue, 19 Aug 2003 14:48:33 +0000 Subject: [PATCH] More accurate fix for bug #25140 --- ext/mbstring/mbstring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index ab2acc4d1c..e90c6967b8 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1864,7 +1864,7 @@ MBSTRING_API char * php_mb_convert_encoding(char *input, size_t length, char *_t if (output_len) { *output_len = 0; } - if ( !input || !length) { + if (!input) { return NULL; } /* new encoding */ @@ -2004,7 +2004,7 @@ PHP_FUNCTION(mb_convert_encoding) if (ret != NULL) { RETVAL_STRINGL(ret, size, 0); /* the string is already strdup()'ed */ } else { - RETVAL_STRINGL("", 0, 1); + RETVAL_FALSE; } if ( s_free) { efree(s_free); -- 2.50.1