Zend/zend_extensions: make zend_extension_version_info const (#10592)

A zend_extension_version_info is never written to.
This commit is contained in:
Max Kellermann 2023-02-20 14:20:54 +01:00 committed by GitHub
parent 3bce116069
commit 7029fd08b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions

View file

@ -63,11 +63,10 @@ zend_result zend_load_extension_handle(DL_HANDLE handle, const char *path)
{ {
#if ZEND_EXTENSIONS_SUPPORT #if ZEND_EXTENSIONS_SUPPORT
zend_extension *new_extension; 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) { 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"); new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry");
if (!new_extension) { if (!new_extension) {

View file

@ -1253,11 +1253,10 @@ PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, const char *
#if ZEND_EXTENSIONS_SUPPORT #if ZEND_EXTENSIONS_SUPPORT
do { do {
zend_extension *new_extension; 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) { 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"); new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry");
if (!new_extension) { if (!new_extension) {