Zend/zend_extensions: make zend_extension_version_info const (#10592)

MaxKellermann · web-flow · commit 7029fd08b11c · 2023-02-20T13:20:54.000Z
A zend_extension_version_info is never written to.
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
@@ -63,11 +63,10 @@ zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
 {
 #if ZEND_EXTENSIONS_SUPPORT
 	zend_extension *new_extension;
-	zend_extension_version_info *extension_version_info;
 
-	extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info");
+	const zend_extension_version_info *extension_version_info = (const zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info");
 	if (!extension_version_info) {
-		extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "_extension_version_info");
+		extension_version_info = (const zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "_extension_version_info");
 	}
 	new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry");
 	if (!new_extension) {
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
@@ -1253,11 +1253,10 @@ PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, const char *
 #if ZEND_EXTENSIONS_SUPPORT
 	do {
 		zend_extension *new_extension;
-		zend_extension_version_info *extension_version_info;
 
-		extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info");
+		const zend_extension_version_info *extension_version_info = (const zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info");
 		if (!extension_version_info) {
-			extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "_extension_version_info");
+			extension_version_info = (const zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "_extension_version_info");
 		}
 		new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry");
 		if (!new_extension) {

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,10 @@ zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)`
`63`	`63`	`{`
`64`	`64`	`#if ZEND_EXTENSIONS_SUPPORT`
`65`	`65`	`zend_extension *new_extension;`
`66`		`- zend_extension_version_info *extension_version_info;`
`67`	`66`
`68`		`- extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info");`
	`67`	`+ const zend_extension_version_info extension_version_info = (const zend_extension_version_info ) DL_FETCH_SYMBOL(handle, "extension_version_info");`
`69`	`68`	`if (!extension_version_info) {`
`70`		`- extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "_extension_version_info");`
	`69`	`+ extension_version_info = (const zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "_extension_version_info");`
`71`	`70`	`}`
`72`	`71`	`new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry");`
`73`	`72`	`if (!new_extension) {`