Merge branch 'PHP-7.4'

Author: nikic

ext/mbstring/php_mbregex.c

@@ -1357,19 +1357,19 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
 	size_t n, i, pos, len;
 	/* Stored as int* in the OnigRegion struct */
 	int beg, end;
-	OnigOptionType option;
+	OnigOptionType option = 0;
 	OnigUChar *str;
 	OnigSyntaxType *syntax;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ss", &arg_pattern, &arg_pattern_len, &arg_options, &arg_options_len) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	option = MBREX(regex_default_options);
-
 	if (arg_options) {
-		option = 0;
 		_php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax, NULL);
+	} else {
+		option |= MBREX(regex_default_options);
+		syntax = MBREX(regex_default_syntax);
 	}
 
 	if (MBREX(search_regs)) {
@@ -1379,7 +1379,7 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
 
 	if (arg_pattern) {
 		/* create regex pattern buffer */
-		if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, MBREX(regex_default_syntax))) == NULL) {
+		if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, syntax)) == NULL) {
 			RETURN_FALSE;
 		}
 	}

ext/mbstring/tests/mb_ereg_search_syntax.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Specifying non-default syntax in mb_ereg_search()
+--FILE--
+<?php
+
+mb_ereg_search_init("a");
+var_dump(mb_ereg_search("a\\{1,2\\}", "b"));
+
+?>
+--EXPECT--
+bool(true)