RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:07:43 +00:00
Code Issues Activity Actions

HackStudio: Make sure Window is destroyed before Application object

Browse source 
We previously stored the Window object in a global RefPtr (for no
apparent reason).

This led to a use-after-free bug in the Window's destructor when
HackStudio was exited via the Quit action (Exiting by closing the
window did not trigger this bug).
This commit is contained in:
Itamar 2021-09-18 17:12:29 +03:00 • committed by Andreas Kling
parent d104885757
commit a27716846f
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Userland/DevTools/HackStudio/main.cpp
View file

@ -24,7 +24,6 @@
using namespace HackStudio; using namespace HackStudio;
static RefPtr<GUI::Window> s_window;
static RefPtr<HackStudioWidget> s_hack_studio_widget; static RefPtr<HackStudioWidget> s_hack_studio_widget;
static bool make_is_available(); static bool make_is_available();
@ -40,9 +39,9 @@ int main(int argc, char** argv)
auto app = GUI::Application::construct(argc, argv); auto app = GUI::Application::construct(argc, argv);
s_window = GUI::Window::construct(); auto window = GUI::Window::construct();
s_window->resize(840, 600); window->resize(840, 600);
s_window->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-hack-studio.png")); window->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-hack-studio.png"));
update_path_environment_variable(); update_path_environment_variable();
@ -61,20 +60,20 @@ int main(int argc, char** argv)
if (argument_absolute_path.is_null()) if (argument_absolute_path.is_null())
project_path = Core::File::real_path_for("."); project_path = Core::File::real_path_for(".");
s_hack_studio_widget = s_window->set_main_widget<HackStudioWidget>(project_path); s_hack_studio_widget = window->set_main_widget<HackStudioWidget>(project_path);
s_window->set_title(String::formatted("{} - Hack Studio", s_hack_studio_widget->project().name())); window->set_title(String::formatted("{} - Hack Studio", s_hack_studio_widget->project().name()));
s_hack_studio_widget->initialize_menubar(*s_window); s_hack_studio_widget->initialize_menubar(*window);
s_window->on_close_request = [&]() -> GUI::Window::CloseRequestDecision { window->on_close_request = [&]() -> GUI::Window::CloseRequestDecision {
s_hack_studio_widget->locator().close(); s_hack_studio_widget->locator().close();
if (s_hack_studio_widget->warn_unsaved_changes("There are unsaved changes, do you want to save before exiting?") == HackStudioWidget::ContinueDecision::Yes) if (s_hack_studio_widget->warn_unsaved_changes("There are unsaved changes, do you want to save before exiting?") == HackStudioWidget::ContinueDecision::Yes)
return GUI::Window::CloseRequestDecision::Close; return GUI::Window::CloseRequestDecision::Close;
return GUI::Window::CloseRequestDecision::StayOpen; return GUI::Window::CloseRequestDecision::StayOpen;
}; };
s_window->show(); window->show();
s_hack_studio_widget->update_actions(); s_hack_studio_widget->update_actions();