Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Fix GH-11716: cli server crashes on SIGINT when compiled with ZEND_RC_DEBUG=1
php · Jul 21, 2023 · 272dc9a · 272dc9a
2 parents 31bd628 + af77d3b
commit 272dc9a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.2.10
 
+- CLI:
+  . Fixed bug GH-11716 (cli server crashes on SIGINT when compiled with
+    ZEND_RC_DEBUG=1). (nielsdos)
+
 - FFI:
   . Fix leaking definitions when using FFI::cdef()->new(...). (ilutov)
 

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
@@ -888,6 +888,11 @@ static zend_always_inline zval *_zend_hash_str_add_or_update_i(HashTable *ht, co
 	ht->nNumOfElements++;
 	p = ht->arData + idx;
 	p->key = key = zend_string_init(str, len, GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
+#if ZEND_RC_DEBUG
+	if (GC_FLAGS(ht) & GC_PERSISTENT_LOCAL) {
+		GC_MAKE_PERSISTENT_LOCAL(key);
+	}
+#endif
 	p->h = ZSTR_H(key) = h;
 	HT_FLAGS(ht) &= ~HASH_FLAG_STATIC_KEYS;
 	if (flag & HASH_LOOKUP) {

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -1381,7 +1381,9 @@ static void php_cli_server_request_ctor(php_cli_server_request *req) /* {{{ */
 	req->query_string_len = 0;
 	zend_hash_init(&req->headers, 0, NULL, cli_header_value_dtor, 1);
 	/* No destructor is registered as the value pointed by is the same as for &req->headers */
+	GC_MAKE_PERSISTENT_LOCAL(&req->headers);
 	zend_hash_init(&req->headers_original_case, 0, NULL, NULL, 1);
+	GC_MAKE_PERSISTENT_LOCAL(&req->headers_original_case);
 	req->content = NULL;
 	req->content_len = 0;
 	req->ext = NULL;
@@ -2312,6 +2314,7 @@ static void php_cli_server_mime_type_ctor(php_cli_server *server, const php_cli_
 	const php_cli_server_ext_mime_type_pair *pair;
 
 	zend_hash_init(&server->extension_mime_types, 0, NULL, NULL, 1);
+	GC_MAKE_PERSISTENT_LOCAL(&server->extension_mime_types);
 
 	for (pair = mime_type_map; pair->ext; pair++) {
 		size_t ext_len = strlen(pair->ext);