svtools/source/misc/acceleratorexecute.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit 233e6a62d12d2d67089f1934777ac41c9fc88238 Author: Norbert Thiebaud <[email protected]> Date: Fri Sep 5 12:44:21 2014 +0200 fdo#69162 avoid crashing on Accellerator in poorly initialized context Change-Id: If3446ae33f2c2e737acf56bb523519e7b9d9935e Reviewed-on: https://gerrit.libreoffice.org/11293 Reviewed-by: Norbert Thiebaud <[email protected]> Tested-by: Norbert Thiebaud <[email protected]> diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 83348b1..4fe6a63 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -181,8 +181,11 @@ bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) OUString sCommand = impl_ts_findCommand(aAWTKey); // No Command found? Do nothing! User isnt interested on any error handling .-) - if (sCommand.isEmpty()) + // or for some reason m_xContext is NULL (which would crash impl_ts_getURLParser() + if (sCommand.isEmpty() || !m_xContext.is()) + { return false; + } // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
