@@ -64,7 +64,7 @@ static char *ddtrace_pre_load_hook(void) {
64
64
}
65
65
66
66
static bool ddloader_is_ext_loaded (const char * name ) {
67
- return zend_hash_str_find_ptr ( & module_registry , name , strlen (name ))
67
+ return ddloader_zend_hash_str_find_ptr ( php_api_no , & module_registry , name , strlen (name ))
68
68
|| zend_get_extension (name )
69
69
;
70
70
}
@@ -390,14 +390,14 @@ static bool ddloader_check_deps(const zend_module_dep *deps) {
390
390
}
391
391
392
392
static void ddloader_unregister_module (const char * name ) {
393
- zend_module_entry * injected = zend_hash_str_find_ptr ( & module_registry , name , strlen (name ));
393
+ zend_module_entry * injected = ddloader_zend_hash_str_find_ptr ( php_api_no , & module_registry , name , strlen (name ));
394
394
if (!injected ) {
395
395
return ;
396
396
}
397
397
398
398
// Set the MSHUTDOWN function to NULL to avoid it being called by zend_hash_str_del
399
399
injected -> module_shutdown_func = NULL ;
400
- zend_hash_str_del ( & module_registry , name , strlen (name ));
400
+ ddloader_zend_hash_str_del ( php_api_no , & module_registry , name , strlen (name ));
401
401
}
402
402
403
403
static PHP_MINIT_FUNCTION (ddloader_injected_extension_minit ) {
@@ -414,7 +414,7 @@ static PHP_MINIT_FUNCTION(ddloader_injected_extension_minit) {
414
414
return SUCCESS ;
415
415
}
416
416
417
- zend_module_entry * module = zend_hash_str_find_ptr ( & module_registry , config -> ext_name , strlen (config -> ext_name ));
417
+ zend_module_entry * module = ddloader_zend_hash_str_find_ptr ( php_api_no , & module_registry , config -> ext_name , strlen (config -> ext_name ));
418
418
if (module ) {
419
419
LOG (INFO , "Extension '%s' is already loaded, unregister the injected extension" , config -> ext_name );
420
420
ddloader_unregister_module (config -> tmp_name );
@@ -446,7 +446,7 @@ static PHP_MINIT_FUNCTION(ddloader_injected_extension_minit) {
446
446
ddloader_zend_hash_set_bucket_key (php_api_no , & module_registry , bucket , new_name );
447
447
ddloader_zend_string_release (php_api_no , new_name );
448
448
449
- module = zend_hash_str_find_ptr ( & module_registry , config -> ext_name , strlen (config -> ext_name ));
449
+ module = ddloader_zend_hash_str_find_ptr ( php_api_no , & module_registry , config -> ext_name , strlen (config -> ext_name ));
450
450
if (!module ) {
451
451
TELEMETRY (REASON_ERROR , "Extension '%s' not found after renaming. Something wrong happened" , config -> ext_name );
452
452
return SUCCESS ;
0 commit comments