diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-14 13:19:32 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-15 06:56:54 +0100 |
commit | b2fa854e81d329c9ed49bd10944cea1a430ecf7e (patch) | |
tree | df1ada57f3c75e33a0902c6d63f72cb50c10727e /toolkit | |
parent | cec943a9409fbc42f544a3eff5e004f04ee7065e (diff) |
tdf#122250 Crash when running extension
as a consequence of
commit 4e07987ce8134312920682e3481c3f8e3d7b66c3
Date: Thu Aug 25 15:08:55 2016 +0200
cid#1371154 Missing move assignment operator
this extensions appears to pass bogus data into VCLXWindow::setProperty,
so I had to workaround that when debugging
Change-Id: Ib6728c0a990bd7cfbfed43d79b7560bd2f7f5a67
Reviewed-on: https://gerrit.libreoffice.org/66297
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 45c7d1dcdc62..6d89c13f3697 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1722,6 +1722,8 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any& WinBits nStyle = pWindow->GetStyle(); sal_uInt16 nTmp = 0; Value >>= nTmp; + // clear any dodgy bits passed in, can come from dodgy extensions + nTmp &= o3tl::typed_flags<WindowBorderStyle>::mask; WindowBorderStyle nBorder = static_cast<WindowBorderStyle>(nTmp); if ( !bool(nBorder) ) { |