- MFH: Fix for bug #25140 (mb_convert_encoding returns FALSE when it tries to

  convert empty string)

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index b0939cebc19fa7dd70749bcb923023fbed400dea..6c0686c8281bad0a8d011652a4a2dff06d7e1394 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2625,7 +2625,7 @@ PHP_FUNCTION(mb_convert_encoding)
        if (ret != NULL) {
                RETVAL_STRINGL(ret, size, 0);           /* the string is already strdup()'ed */
        } else {
-               RETVAL_FALSE;
+               RETVAL_STRINGL("", 0, 1);
        }
        if ( s_free) {
                efree(s_free);