Merge branch 'PHP-7.4'

nikic · nikic · commit 22d2a80031bc · 2020-01-29T16:05:47.000+01:00
* PHP-7.4:
  Reset MBREX(search_re) in RSHUTDOWN
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
@@ -154,6 +154,7 @@ PHP_RSHUTDOWN_FUNCTION(mb_regex)
 		ZVAL_UNDEF(&MBREX(search_str));
 	}
 	MBREX(search_pos) = 0;
+	MBREX(search_re) = NULL;
 
 	if (MBREX(search_regs) != NULL) {
 		onig_region_free(MBREX(search_regs), 1);

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ PHP_RSHUTDOWN_FUNCTION(mb_regex)`
`154`	`154`	`ZVAL_UNDEF(&MBREX(search_str));`
`155`	`155`	`}`
`156`	`156`	`MBREX(search_pos) = 0;`
	`157`	`+ MBREX(search_re) = NULL;`
`157`	`158`
`158`	`159`	`if (MBREX(search_regs) != NULL) {`
`159`	`160`	`onig_region_free(MBREX(search_regs), 1);`