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 21:09:57 +0200 |
| commit | 40dfeb8d1e0828ff1f9f7d50e2ff894d45cce9b4 (patch) | |
| tree | 042c41a09c69ce3470bd5f30d65583723baf6382 /framework | |
| parent | 819671b662c441087f6f3a363cae27491e5344d9 (diff) | |
tdf#126054 uses after free when menubutton and menu torn down during execution
Change-Id: Ib79da121941863421bc12afa27e27cdd7e2e81e3
Reviewed-on: https://gerrit.libreoffice.org/74696
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
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 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 ); |