diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-25 14:00:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-25 18:13:36 +0200 |
| commit | 0e79841b4f16ea71b019f298e7887c3c74efeb7e (patch) | |
| tree | 6f7b5a4e3044e518b1da4875a1fe368b6f401c7b /framework/source/uielement | |
| parent | 7b726e587ec7bbe8926fd00a50c0192ad32b3858 (diff) | |
tdf#126054 uses after free when menubutton and menu torn down during execution
Change-Id: Ib79da121941863421bc12afa27e27cdd7e2e81e3
Reviewed-on: https://gerrit.libreoffice.org/74695
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework/source/uielement')
| -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 2638f9a8c022..fd61a275caeb 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 ); |