From 7ead4f11b4d87384a5894947c0efe440bed80642 Mon Sep 17 00:00:00 2001 From: Piotr Warszawski Date: Fri, 4 Sep 2026 22:09:23 +0200 Subject: [PATCH] whois: guard against a null activator whois_event::run_() dereferenced m_activator unconditionally in every branch (this predates this PR). getvalues_event::run_() and putvalues_event::run_() already guard the same way elsewhere in this file; whois_event was missing it. Single early return covers every branch, old and new. --- world/Event.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/world/Event.cpp b/world/Event.cpp index 09afec61..73f10592 100644 --- a/world/Event.cpp +++ b/world/Event.cpp @@ -1014,6 +1014,8 @@ whois_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { void whois_event::run_() { + if( m_activator == nullptr ) { return; } + for( auto &target : m_targets ) { auto *targetcell { static_cast( std::get( target ) ) }; if( targetcell == nullptr ) { continue; }