From 746e760697713d61ddc0b76fa44dc5e41f3e804a Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 23 Feb 2026 21:32:18 -0600 Subject: [PATCH] Remove dead NULL check on s_original_callback --- esphome/core/lwip_fast_select.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/esphome/core/lwip_fast_select.c b/esphome/core/lwip_fast_select.c index cdbd32c8e6..79464e0038 100644 --- a/esphome/core/lwip_fast_select.c +++ b/esphome/core/lwip_fast_select.c @@ -112,9 +112,9 @@ static netconn_callback s_original_callback = NULL; static void esphome_socket_event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len) { // Call original LwIP event_callback first — updates rcvevent/sendevent/errevent, // signals any select() waiters. This preserves all LwIP behavior. - if (s_original_callback) { - s_original_callback(conn, evt, len); - } + // s_original_callback is always valid here: hook_socket() sets it before swapping + // the callback pointer, so this wrapper cannot run until it's initialized. + s_original_callback(conn, evt, len); // Wake the main loop task if sleeping in ulTaskNotifyTake(). // Only notify on receive events to avoid spurious wakeups from send-ready events. if (evt == NETCONN_EVT_RCVPLUS) {