Fix windows

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

Author: bwoebi

ext/sidecar.c

@@ -31,9 +31,10 @@ struct ddog_InstanceId *ddtrace_sidecar_instance_id;
 static uint8_t dd_sidecar_formatted_session_id[36];
 
 // Best-effort pointer for the signal handler (SIGTERM/SIGINT). Set to the first
-// per-thread connection; never cleared until MSHUTDOWN. Signal context cannot
-// safely call TSRMLS_FETCH(), so this is the only option.
-_Atomic(ddog_SidecarTransport *) ddtrace_sidecar_for_signal = NULL;
+// per-thread connection; never cleared until MSHUTDOWN. Not atomic: concurrent
+// shutdown is already a best-effort race for signal handlers, so atomicity of
+// the pointer load alone would not prevent the underlying use-after-free.
+ddog_SidecarTransport *ddtrace_sidecar_for_signal = NULL;
 
 // Connection mode tracking
 dd_sidecar_active_mode_t ddtrace_sidecar_active_mode = DD_SIDECAR_CONNECTION_NONE;
@@ -406,9 +407,8 @@ void ddtrace_sidecar_setup(bool appsec_activation, bool appsec_config) {
     }
 
     // Record the first established connection for best-effort signal-handler use.
-    if (DDTRACE_G(sidecar)) {
-        ddog_SidecarTransport *expected = NULL;
-        atomic_compare_exchange_strong(&ddtrace_sidecar_for_signal, &expected, DDTRACE_G(sidecar));
+    if (DDTRACE_G(sidecar) && !ddtrace_sidecar_for_signal) {
+        ddtrace_sidecar_for_signal = DDTRACE_G(sidecar);
     }
 }
 
@@ -445,7 +445,7 @@ void ddtrace_sidecar_handle_fork(void) {
         ddog_sidecar_transport_drop(DDTRACE_G(sidecar));
         DDTRACE_G(sidecar) = NULL;
     }
-    atomic_store(&ddtrace_sidecar_for_signal, NULL);
+    ddtrace_sidecar_for_signal = NULL;
 
     if (ddtrace_sidecar_active_mode == DD_SIDECAR_CONNECTION_THREAD) {
         ddtrace_ffi_try("Failed clearing inherited listener state",
@@ -486,7 +486,7 @@ void ddtrace_sidecar_handle_fork(void) {
     }
 
     if (DDTRACE_G(sidecar)) {
-        atomic_store(&ddtrace_sidecar_for_signal, DDTRACE_G(sidecar));
+        ddtrace_sidecar_for_signal = DDTRACE_G(sidecar);
     }
 #endif
 }
@@ -498,9 +498,8 @@ void ddtrace_sidecar_ensure_active(void) {
         // First RINIT on this thread: the process-level setup already ran (endpoint is
         // set), so establish this thread's own connection now.
         DDTRACE_G(sidecar) = ddtrace_sidecar_connect(false);
-        if (DDTRACE_G(sidecar)) {
-            ddog_SidecarTransport *expected = NULL;
-            atomic_compare_exchange_strong(&ddtrace_sidecar_for_signal, &expected, DDTRACE_G(sidecar));
+        if (DDTRACE_G(sidecar) && !ddtrace_sidecar_for_signal) {
+            ddtrace_sidecar_for_signal = DDTRACE_G(sidecar);
         }
     }
 }
@@ -540,6 +539,8 @@ void ddtrace_sidecar_shutdown(void) {
         current_pid == ddtrace_sidecar_master_pid) {
 
         if (DDTRACE_G(sidecar)) {
+            ddtrace_sidecar_for_signal = NULL;
+
             ddog_sidecar_transport_drop(DDTRACE_G(sidecar));
             DDTRACE_G(sidecar) = NULL;
         }
@@ -554,8 +555,6 @@ void ddtrace_sidecar_shutdown(void) {
         ddtrace_sidecar_instance_id = NULL;
     }
 
-    atomic_store(&ddtrace_sidecar_for_signal, NULL);
-
     if (ddtrace_endpoint) {
         dd_free_endpoints();
     }
@@ -873,6 +872,8 @@ void ddtrace_sidecar_rshutdown(void) {
 
 void ddtrace_sidecar_gshutdown(void) {
     if (DDTRACE_G(sidecar)) {
+        ddtrace_sidecar_for_signal = NULL;
+
         // Drain any accumulated background-sender metrics before the transport goes away.
         ddtrace_telemetry_flush_bgs_metrics_final();
         ddog_sidecar_transport_drop(DDTRACE_G(sidecar));

ext/sidecar.h

@@ -19,7 +19,8 @@ typedef enum {
 extern struct ddog_InstanceId *ddtrace_sidecar_instance_id;
 // Best-effort pointer used only by the signal handler (SIGTERM/SIGINT), which cannot call
 // TSRMLS_FETCH() safely.  Set to the first thread's connection; never cleared until MSHUTDOWN.
-extern _Atomic(ddog_SidecarTransport *) ddtrace_sidecar_for_signal;
+// Not atomic: concurrent shutdown is a pre-existing best-effort race for signal handlers.
+extern ddog_SidecarTransport *ddtrace_sidecar_for_signal;
 extern ddog_Endpoint *ddtrace_endpoint;
 extern dd_sidecar_active_mode_t ddtrace_sidecar_active_mode;
 extern int32_t ddtrace_sidecar_master_pid;

ext/signals.c

@@ -363,10 +363,7 @@ static int dd_call_prev_handler(bool flush) {
     }
 
     if (flush) {
-        // Load into a plain local: the function expects ddog_SidecarTransport **,
-        // but ddtrace_sidecar_for_signal is _Atomic so &it would be the wrong type.
-        ddog_SidecarTransport *sidecar = atomic_load(&ddtrace_sidecar_for_signal);
-        ddog_sidecar_flush_traces(&sidecar);
+        ddog_sidecar_flush_traces(&ddtrace_sidecar_for_signal);
     }
 
     if (prev_handler == SIG_DFL) {