From ad400f11449bec5c98b5e261ccf5d534d71f5056 Mon Sep 17 00:00:00 2001 From: Rui Hirokawa Date: Sat, 16 Feb 2008 11:46:03 +0000 Subject: [PATCH] fixed #43994 mb_ereg 'successfully' matching incorrectly. --- ext/mbstring/php_mbregex.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 3996600ebb9..bb49e591543 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -546,6 +546,13 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase) convert_to_string_ex(arg_pattern); /* don't bother doing an extended regex with just a number */ } + + if (!Z_STRVAL_PP(arg_pattern) || Z_STRLEN_PP(arg_pattern) == 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "empty pattern"); + RETVAL_FALSE; + goto out; + } + re = php_mbregex_compile_pattern(Z_STRVAL_PP(arg_pattern), Z_STRLEN_PP(arg_pattern), options, MBSTRG(current_mbctype), MBSTRG(regex_default_syntax) TSRMLS_CC); if (re == NULL) { RETVAL_FALSE;