Merge branch 'PHP-7.3'

weltling · weltling · commit 3de0ba7cbfa2 · 2018-09-08T21:38:05.000+02:00
* PHP-7.3:
  Fixed bug #76850 Exit code mangled by set locale/preg_match
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
@@ -729,6 +729,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex)
 	if (key != regex) {
 		tables = (uint8_t *)zend_hash_find_ptr(&char_tables, BG(locale_string));
 		if (!tables) {
+			zend_string *_k;
 			tables = pcre2_maketables(gctx);
 			if (UNEXPECTED(!tables)) {
 				php_error_docref(NULL,E_WARNING, "Failed to generate locale character tables");
@@ -737,7 +738,9 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex)
 				efree(pattern);
 				return NULL;
 			}
-			zend_hash_add_ptr(&char_tables, BG(locale_string), (void *)tables);
+			_k = zend_string_dup(BG(locale_string), 1);
+			zend_hash_add_ptr(&char_tables, _k, (void *)tables);
+			zend_string_release(_k);
 		}
 		pcre2_set_character_tables(cctx, tables);
 	}

Original file line number	Diff line number	Diff line change
`@@ -729,6 +729,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex)`
`729`	`729`	`if (key != regex) {`
`730`	`730`	`tables = (uint8_t *)zend_hash_find_ptr(&char_tables, BG(locale_string));`
`731`	`731`	`if (!tables) {`
	`732`	`+ zend_string *_k;`
`732`	`733`	`tables = pcre2_maketables(gctx);`
`733`	`734`	`if (UNEXPECTED(!tables)) {`
`734`	`735`	`php_error_docref(NULL,E_WARNING, "Failed to generate locale character tables");`
`@@ -737,7 +738,9 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex)`
`737`	`738`	`efree(pattern);`
`738`	`739`	`return NULL;`
`739`	`740`	`}`
`740`		`- zend_hash_add_ptr(&char_tables, BG(locale_string), (void *)tables);`
	`741`	`+ _k = zend_string_dup(BG(locale_string), 1);`
	`742`	`+ zend_hash_add_ptr(&char_tables, _k, (void *)tables);`
	`743`	`+ zend_string_release(_k);`
`741`	`744`	`}`
`742`	`745`	`pcre2_set_character_tables(cctx, tables);`
`743`	`746`	`}`