MFH: fixed mb_ereg_search() segfault

diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index 8d4dd20ccb6c432fd21018ec1d3628582eb565e7..b4c12142e1ddae3d1d83d32a61b3a97cb0f02b29 100644 (file)
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -770,7 +770,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));
        }