Fix GH-8310: Registry settings are no longer recognized

cmb69 · cmb69 · commit 1bd9890b20fd · 2022-04-06T17:33:30.000+02:00
`zend_file_handle->filename` is a `zend_string*` pointer now, so we must not cast to `char*` but rather pass the underlying `char*`. Closes GH-8313.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.6
 
+- Core:
+  . Fixed bug GH-8310 (Registry settings are no longer recognized). (cmb)
+
 - Date:
   . Fixed bug GH-7752 (DateTimeZone::getTransitions() returns insufficient
     data). (Derick)
diff --git a/main/main.c b/main/main.c
@@ -2489,7 +2489,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file)
 
 #ifdef PHP_WIN32
 		if(primary_file->filename) {
-			UpdateIniFromRegistry((char*)primary_file->filename);
+			UpdateIniFromRegistry(ZSTR_VAL(primary_file->filename));
 		}
 #endif
 
@@ -2581,7 +2581,7 @@ PHPAPI int php_execute_simple_script(zend_file_handle *primary_file, zval *ret)
 	zend_try {
 #ifdef PHP_WIN32
 		if(primary_file->filename) {
-			UpdateIniFromRegistry((char*)primary_file->filename);
+			UpdateIniFromRegistry(ZSTR_VAL(primary_file->filename));
 		}
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -2489,7 +2489,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file)`
`2489`	`2489`
`2490`	`2490`	`#ifdef PHP_WIN32`
`2491`	`2491`	`if(primary_file->filename) {`
`2492`		`- UpdateIniFromRegistry((char*)primary_file->filename);`
	`2492`	`+ UpdateIniFromRegistry(ZSTR_VAL(primary_file->filename));`
`2493`	`2493`	`}`
`2494`	`2494`	`#endif`
`2495`	`2495`
`@@ -2581,7 +2581,7 @@ PHPAPI int php_execute_simple_script(zend_file_handle primary_file, zval ret)`
`2581`	`2581`	`zend_try {`
`2582`	`2582`	`#ifdef PHP_WIN32`
`2583`	`2583`	`if(primary_file->filename) {`
`2584`		`- UpdateIniFromRegistry((char*)primary_file->filename);`
	`2584`	`+ UpdateIniFromRegistry(ZSTR_VAL(primary_file->filename));`
`2585`	`2585`	`}`
`2586`	`2586`	`#endif`
`2587`	`2587`