Fixed mb_ereg_search() segfault that occurs when the function is called

before a string to be searched is passed by mb_ereg_search_init()

diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index ecf8183e34ff5ef869649bc5c3b797144a987c53..5997d98acc3630665f5fada7f0ed5bffa190ea6e 100644 (file)
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -855,7 +855,7 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
        pos = MBSTRG(search_pos);
        str = NULL;
        len = 0;
-       if (Z_TYPE_PP(MBSTRG(search_str)) == IS_STRING){
+       if (MBSTRG(search_str) != NULL && Z_TYPE_PP(MBSTRG(search_str)) == IS_STRING){
                str = (unsigned char *)Z_STRVAL_PP(MBSTRG(search_str));
                len = Z_STRLEN_PP(MBSTRG(search_str));
        }