[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/control/menubtn.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4e4362daade150f3f34520bd5e6e4673ea88efce
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 24 11:52:51 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 24 14:46:13 2020 +0200

    tdf#136678 crash in collectUIInformation
    
    since...
    
    commit cdb9c24b45ce7c35cf507430bd5ee1d9c3d5ea72
    Date:   Fri Aug 28 05:35:22 2020 +0200
    
    Change-Id: I28f621a601daa2ccc6c893561c9de402f22c8657
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103303
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index f6d32d28db73..d1488f308c6f 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -95,13 +95,14 @@ void MenuButton::ExecuteMenu()
     mbStartingMenu = false;
 
     SetPressed(false);
+    OUString aID = get_id(); // tdf#136678 take a copy if we are destroyed by Select callback
     if (mnCurItemId)
     {
         Select();
         mnCurItemId = 0;
         msCurItemIdent.clear();
     }
-    collectUIInformation(get_id(),"OPENLIST","","");
+    collectUIInformation(aID,"OPENLIST","","");
 }
 
 void MenuButton::CancelMenu()