Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: Fix uninitialized lineno in constant AST of internal enums
php · Sep 8, 2024 · e207071 · e207071
2 parents 7023fb9 + 08e0729
commit e207071
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -12,6 +12,7 @@ PHP                                                                        NEWS
   . Fixed bug GH-15587 (CRC32 API build error on arm 32-bit).
     (Bernd Kuhls, Thomas Petazzoni)
   . Fixed bug GH-15330 (Do not scan generator frames more than once). (Arnaud)
+  . Fixed uninitialized lineno in constant AST of internal enums. (ilutov)
 
 - Curl:
   . FIxed bug GH-15547 (curl_multi_select overflow on timeout argument).

diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c
@@ -541,19 +541,22 @@ static zend_ast_ref *create_enum_case_ast(
 	ast->child[0]->attr = 0;
 	ZEND_ASSERT(ZSTR_IS_INTERNED(class_name));
 	ZVAL_STR(zend_ast_get_zval(ast->child[0]), class_name);
+	Z_LINENO_P(zend_ast_get_zval(ast->child[0])) = 0;
 
 	ast->child[1] = (zend_ast *) p; p += sizeof(zend_ast_zval);
 	ast->child[1]->kind = ZEND_AST_ZVAL;
 	ast->child[1]->attr = 0;
 	ZEND_ASSERT(ZSTR_IS_INTERNED(case_name));
 	ZVAL_STR(zend_ast_get_zval(ast->child[1]), case_name);
+	Z_LINENO_P(zend_ast_get_zval(ast->child[1])) = 0;
 
 	if (value) {
 		ast->child[2] = (zend_ast *) p; p += sizeof(zend_ast_zval);
 		ast->child[2]->kind = ZEND_AST_ZVAL;
 		ast->child[2]->attr = 0;
 		ZEND_ASSERT(!Z_REFCOUNTED_P(value));
 		ZVAL_COPY_VALUE(zend_ast_get_zval(ast->child[2]), value);
+		Z_LINENO_P(zend_ast_get_zval(ast->child[2])) = 0;
 	} else {
 		ast->child[2] = NULL;
 	}