From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 16 Jun 2020 12:32:33 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbe74a6e3a6f83d3ff5108aa09c6a16699e5123f;p=php

Merge branch 'PHP-7.4'
---

bbe74a6e3a6f83d3ff5108aa09c6a16699e5123f
diff --cc ext/mbstring/php_mbregex.c
index bc36596988,76aff4f244..c614b0d5a4
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@@ -1354,22 -1425,20 +1354,22 @@@ _php_mb_regex_ereg_search_exec(INTERNAL
  	char *arg_pattern = NULL, *arg_options = NULL;
  	size_t arg_pattern_len, arg_options_len;
  	int err;
 -	size_t n, i, pos, len, beg, end;
 +	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;
 +		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 -1448,7 +1379,7 @@@
  
  	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, MBREX(current_mbctype), syntax)) == NULL) {
++		if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, syntax)) == NULL) {
  			RETURN_FALSE;
  		}
  	}