php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 09:42:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

MFH(r-1.38): fixed segfault in mb_ereg_match()

Browse Source
This commit is contained in:
Moriyoshi Koizumi
2003-04-03 00:15:58 +00:00
parent 043a1f5b36
commit e64002e9ef
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/mbstring/php_mbregex.c
View File

@@ -685,7 +685,8 @@ PHP_FUNCTION(mb_split)
Regular expression match for multibyte string */
PHP_FUNCTION(mb_ereg_match)
{
zval *arg_pattern;
char *arg_pattern;
int arg_pattern_len;
char *string;
int string_len;
@@ -698,8 +699,8 @@ PHP_FUNCTION(mb_ereg_match)
char *option_str = NULL;
int option_str_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|s",
&arg_pattern, &string, &string_len,
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s",
&arg_pattern, &arg_pattern_len, &string, &string_len,
&option_str, &option_str_len)==FAILURE) {
RETURN_FALSE;
}
@@ -710,12 +711,11 @@ PHP_FUNCTION(mb_ereg_match)
option |= MBSTRG(regex_default_options);
}
}
convert_to_string_ex(&arg_pattern);
err = php_mbregex_compile_pattern(
&re,
Z_STRVAL_P(arg_pattern),
Z_STRLEN_P(arg_pattern),
arg_pattern,
arg_pattern_len,
option, MBSTRG(current_mbctype) TSRMLS_CC);
if (err) {