PHP 8.6: ZSTR_INIT_LITERAL() no longer takes non-literals, so use zend_string_init()

derickr · derickr · commit fab315a003e8 · 2025-12-10T16:26:03.000Z
diff --git a/src/profiler/profiler.c b/src/profiler/profiler.c
@@ -354,7 +354,7 @@ void xdebug_profiler_add_function_details_user(function_stack_entry *fse, zend_o
 	} else {
 		fse->profiler.filename = zend_string_copy(fse->filename);
 	}
-	fse->profiler.function = ZSTR_INIT_LITERAL(tmp_name, false);
+	fse->profiler.function = zend_string_init(tmp_name, strlen(tmp_name), false);
 	xdfree(tmp_name);
 }
 
@@ -383,7 +383,7 @@ void xdebug_profiler_add_function_details_internal(function_stack_entry *fse)
 	}
 
 	fse->profiler.filename = zend_string_copy(fse->filename);
-	fse->profiler.function = ZSTR_INIT_LITERAL(tmp_name, false);
+	fse->profiler.function = zend_string_init(tmp_name, strlen(tmp_name), false);
 
 	xdfree(tmp_name);
 }

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ void xdebug_profiler_add_function_details_user(function_stack_entry *fse, zend_o`
`354`	`354`	`} else {`
`355`	`355`	`fse->profiler.filename = zend_string_copy(fse->filename);`
`356`	`356`	`}`
`357`		`- fse->profiler.function = ZSTR_INIT_LITERAL(tmp_name, false);`
	`357`	`+ fse->profiler.function = zend_string_init(tmp_name, strlen(tmp_name), false);`
`358`	`358`	`xdfree(tmp_name);`
`359`	`359`	`}`
`360`	`360`
`@@ -383,7 +383,7 @@ void xdebug_profiler_add_function_details_internal(function_stack_entry *fse)`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`fse->profiler.filename = zend_string_copy(fse->filename);`
`386`		`- fse->profiler.function = ZSTR_INIT_LITERAL(tmp_name, false);`
	`386`	`+ fse->profiler.function = zend_string_init(tmp_name, strlen(tmp_name), false);`
`387`	`387`
`388`	`388`	`xdfree(tmp_name);`
`389`	`389`	`}`