hebrev/hebrevc: Don't return false for empty string

There is nothing special about the empty string in this context,
we should pass it through unchanged.

diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
index dfb4451b2e0f5b5009fd53a22c05e70ce22ea4f6..ae33da0022a0da4597e44a64c9b730c587181c75 100644 (file)
--- a/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@ -189,8 +189,8 @@ static const func_info_t func_infos[] = {
        F0("strrpos",                      MAY_BE_FALSE | MAY_BE_LONG),
        F0("strripos",                     MAY_BE_FALSE | MAY_BE_LONG),
        F1("strrev",                       MAY_BE_STRING),
-       F1("hebrev",                       MAY_BE_FALSE | MAY_BE_STRING),
-       F1("hebrevc",                      MAY_BE_FALSE | MAY_BE_STRING),
+       F1("hebrev",                       MAY_BE_STRING),
+       F1("hebrevc",                      MAY_BE_STRING),
        FN("nl2br",                        MAY_BE_STRING),
        F1("basename",                     MAY_BE_STRING),
        F1("dirname",                      MAY_BE_NULL | MAY_BE_STRING),

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 757dcec8004f8beeba6bdaf69e0d3ccb04ddd7ce..39739c82c0af7a42a070e57a9797cc158ccc1cac 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -4345,7 +4345,7 @@ static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS, int convert_newlines)
        ZEND_PARSE_PARAMETERS_END();
 
        if (str_len == 0) {
-               RETURN_FALSE;
+               RETURN_EMPTY_STRING();
        }
 
        tmp = str;