Don't store getenv pointer as it can become invalid

Author: iamluc

ddtrace.sym

@@ -13,7 +13,6 @@ ddtrace_metric_register_buffer
 ddtrace_metric_add_point
 ddtrace_emit_asm_event
 ddtrace_loaded_by_ssi
-ddtrace_ssi_injection_enabled
 ddtrace_ssi_forced_injection_enabled
 ddog_remote_config_reader_for_path
 ddog_remote_config_read

ext/telemetry.c

@@ -12,8 +12,7 @@ ZEND_EXTERN_MODULE_GLOBALS(ddtrace);
 
 // These globals are set by the SSI loader
 DDTRACE_PUBLIC bool ddtrace_loaded_by_ssi = false;
-DDTRACE_PUBLIC char *ddtrace_ssi_injection_enabled = NULL;
-DDTRACE_PUBLIC char *ddtrace_ssi_forced_injection_enabled = NULL;
+DDTRACE_PUBLIC bool ddtrace_ssi_forced_injection_enabled = false;
 
 zend_long dd_composer_hook_id;
 ddog_QueueId dd_bgs_queued_id;
@@ -170,11 +169,13 @@ void ddtrace_telemetry_finalize(void) {
     // Send extra internal configuration
     ddog_CharSlice instrumentation_source = ddtrace_loaded_by_ssi ? DDOG_CHARSLICE_C("ssi") : DDOG_CHARSLICE_C("manual");
     ddog_sidecar_telemetry_enqueueConfig_buffer(buffer, DDOG_CHARSLICE_C("instrumentation_source"), instrumentation_source, DDOG_CONFIGURATION_ORIGIN_DEFAULT, DDOG_CHARSLICE_C(""));
-    if (ddtrace_ssi_injection_enabled) {
-        ddog_sidecar_telemetry_enqueueConfig_buffer(buffer, DDOG_CHARSLICE_C("ssi_injection_enabled"), (ddog_CharSlice) {.ptr = ddtrace_ssi_injection_enabled, .len = strlen(ddtrace_ssi_injection_enabled)}, DDOG_CONFIGURATION_ORIGIN_ENV_VAR, DDOG_CHARSLICE_C(""));
-    }
-    if (ddtrace_ssi_forced_injection_enabled) {
-        ddog_sidecar_telemetry_enqueueConfig_buffer(buffer, DDOG_CHARSLICE_C("ssi_forced_injection_enabled"), (ddog_CharSlice) {.ptr = ddtrace_ssi_forced_injection_enabled, .len = strlen(ddtrace_ssi_forced_injection_enabled)}, DDOG_CONFIGURATION_ORIGIN_ENV_VAR, DDOG_CHARSLICE_C(""));
+
+    ddog_CharSlice ssi_forced = ddtrace_ssi_forced_injection_enabled ? DDOG_CHARSLICE_C("True") : DDOG_CHARSLICE_C("False");
+    ddog_sidecar_telemetry_enqueueConfig_buffer(buffer, DDOG_CHARSLICE_C("ssi_forced_injection_enabled"), ssi_forced, DDOG_CONFIGURATION_ORIGIN_ENV_VAR, DDOG_CHARSLICE_C(""));
+
+    char *injection_enabled = getenv("DD_INJECTION_ENABLED");
+    if (injection_enabled) {
+        ddog_sidecar_telemetry_enqueueConfig_buffer(buffer, DDOG_CHARSLICE_C("ssi_injection_enabled"), (ddog_CharSlice) {.ptr = injection_enabled, .len = strlen(injection_enabled)}, DDOG_CONFIGURATION_ORIGIN_ENV_VAR, DDOG_CHARSLICE_C(""));
     }
 
     // Send information about explicitly disabled integrations

loader/dd_library_loader.c

@@ -234,13 +234,9 @@ static void ddtrace_pre_minit_hook(injected_ext *config, zend_module_entry *modu
     if (ddtrace_loaded_by_ssi) {
         *ddtrace_loaded_by_ssi = true;
     }
-    char **ddtrace_ssi_injection_enabled = (char **)DL_FETCH_SYMBOL(module->handle, "ddtrace_ssi_injection_enabled");
-    if (ddtrace_ssi_injection_enabled) {
-        *ddtrace_ssi_injection_enabled = getenv("DD_INJECTION_ENABLED");
-    }
-    char **ddtrace_ssi_forced_injection_enabled = (char **)DL_FETCH_SYMBOL(module->handle, "ddtrace_ssi_forced_injection_enabled");
+    bool *ddtrace_ssi_forced_injection_enabled = (bool *)DL_FETCH_SYMBOL(module->handle, "ddtrace_ssi_forced_injection_enabled");
     if (ddtrace_ssi_forced_injection_enabled) {
-        *ddtrace_ssi_forced_injection_enabled = force_load ? "True" : "False";
+        *ddtrace_ssi_forced_injection_enabled = force_load;
     }
 }