From efc2fc6888db0bf93babbfc8a085bb370db99c8e Mon Sep 17 00:00:00 2001 From: Brandon Scott Date: Sat, 12 Oct 2019 18:02:39 -0500 Subject: [PATCH] LibGUI: Fix GMenu submenu shortcut bug. I was encountering an entire system crash when the window server attempted to do something with the shortcut text on a submenu. This bug only seemed to appear when I had a lone submenu inside of a menu. --- Libraries/LibGUI/GMenu.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Libraries/LibGUI/GMenu.cpp b/Libraries/LibGUI/GMenu.cpp index 9be1fc53d6..c24dd888d6 100644 --- a/Libraries/LibGUI/GMenu.cpp +++ b/Libraries/LibGUI/GMenu.cpp @@ -113,6 +113,11 @@ int GMenu::realize_menu() request.menu.enabled = true; request.menu.checkable = false; request.menu.checked = false; + + // no shortcut on submenu, make sure this is cleared out + request.menu.shortcut_text_length = 0; + strcpy(request.menu.shortcut_text, "\0"); + ASSERT(submenu.name().length() < (ssize_t)sizeof(request.text)); strcpy(request.text, submenu.name().characters()); request.text_length = submenu.name().length();