Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit 085371b2994f · 2020-01-29T16:05:38.000+01:00
* PHP-7.3:
  Reset MBREX(search_re) in RSHUTDOWN
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
@@ -156,6 +156,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
`@@ -156,6 +156,7 @@ PHP_RSHUTDOWN_FUNCTION(mb_regex)`
`156`	`156`	`ZVAL_UNDEF(&MBREX(search_str));`
`157`	`157`	`}`
`158`	`158`	`MBREX(search_pos) = 0;`
	`159`	`+ MBREX(search_re) = NULL;`
`159`	`160`
`160`	`161`	`if (MBREX(search_regs) != NULL) {`
`161`	`162`	`onig_region_free(MBREX(search_regs), 1);`