More accurate fix for bug #25140

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index ab2acc4d1ca9876e24e1c791d728d0b18a9e0ccc..e90c6967b8050a0dda938d858ffbc214f955e713 100644 (file)
--- 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);