diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-25 14:00:20 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-07-06 08:06:47 +0200 |
| commit | 21e6a8ee08e187cd36373c51de63fada5437b06f (patch) | |
| tree | 9ae6c0f9ec1eda36c1e2e7c54ab2a6362f9c33e7 /framework | |
| parent | 03b8096844842a6d129a5f9ae715a9d2cf22e697 (diff) | |
tdf#126054 uses after free when menubutton and menu torn down during execution
Change-Id: Ib79da121941863421bc12afa27e27cdd7e2e81e3
Reviewed-on: https://gerrit.libreoffice.org/74697
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit a4f67bce94b080062edf8cd5ba7113d5e384d63d)
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 022f5d766c5d..03ae835a16ba 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -890,7 +890,9 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu, bool ) } } - if ( xDispatch.is() ) + // tdf#126054 don't let dispatch destroy this until after function completes + rtl::Reference<MenuBarManager> xRef(this); + if (xDispatch.is()) { SolarMutexReleaser aReleaser; xDispatch->dispatch( aTargetURL, aArgs ); |