From 6b1571e8fd288ea179557312ff7d2ef69dfa786d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 14 Feb 2023 20:44:01 +0100 Subject: [PATCH] Zend/zend_extensions: make zend_extension_version_info const A zend_extension_version_info is never written to. --- Zend/zend_extensions.c | 5 ++--- sapi/phpdbg/phpdbg_prompt.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c index 9dc0d2c616652..ffcd32aa08fdc 100644 --- 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 index ce0bb161659fe..f8041c660f266 100644 --- 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) {