From 18fca3c29456bbab6b262eeadd5a94520fdb4e3c Mon Sep 17 00:00:00 2001 From: Danil Alexeev Date: Wed, 8 May 2024 17:39:33 +0300 Subject: [PATCH] Editor: Fix `EditorHelpBitTooltip` + `ProgressDialog` causes crash --- editor/editor_help.cpp | 16 +++++++++++++++- editor/editor_help.h | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index d0ad0e8b115..fd728dc3939 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -3760,6 +3760,14 @@ EditorHelpBit::EditorHelpBit(const String &p_symbol) { /// EditorHelpBitTooltip /// +void EditorHelpBitTooltip::_safe_queue_free() { + if (_pushing_input > 0) { + _need_free = true; + } else { + queue_free(); + } +} + void EditorHelpBitTooltip::_notification(int p_what) { switch (p_what) { case NOTIFICATION_WM_MOUSE_ENTER: @@ -3778,7 +3786,13 @@ void EditorHelpBitTooltip::_input_from_window(const Ref &p_event) { } else { const Ref mouse_event = p_event; if (mouse_event.is_null()) { + // GH-91652. Prevents use-after-free since `ProgressDialog` calls `Main::iteration()`. + _pushing_input++; get_parent_viewport()->push_input(p_event); + _pushing_input--; + if (_pushing_input <= 0 && _need_free) { + queue_free(); + } } } } @@ -3839,7 +3853,7 @@ EditorHelpBitTooltip::EditorHelpBitTooltip(Control *p_target) { timer = memnew(Timer); timer->set_wait_time(0.2); - timer->connect("timeout", callable_mp(static_cast(this), &Node::queue_free)); + timer->connect("timeout", callable_mp(this, &EditorHelpBitTooltip::_safe_queue_free)); add_child(timer); ERR_FAIL_NULL(p_target); diff --git a/editor/editor_help.h b/editor/editor_help.h index ca3a05275f5..76f9e71931a 100644 --- a/editor/editor_help.h +++ b/editor/editor_help.h @@ -325,6 +325,10 @@ class EditorHelpBitTooltip : public PopupPanel { GDCLASS(EditorHelpBitTooltip, PopupPanel); Timer *timer = nullptr; + int _pushing_input = 0; + bool _need_free = false; + + void _safe_queue_free(); protected: void _notification(int p_what);