diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-14 13:19:32 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-01-17 14:43:41 +0100 |
| commit | 13f8f38d9d6a102cbd53bdf56229324ee9dc7923 (patch) | |
| tree | 79806f5a3a599e404623dd5a264d480a19df45c9 /toolkit | |
| parent | 6de3c4450e8a3d34633ca0865f7186622f14f206 (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>
(cherry picked from commit b2fa854e81d329c9ed49bd10944cea1a430ecf7e)
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 f0a3cd605588..341679e1cd3e 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1700,6 +1700,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) ) { |