diff options
| author | Patrick Luby <plubius@neooffice.org> | 2023-10-11 14:36:12 -0400 |
|---|---|---|
| committer | Patrick Luby <plubius@neooffice.org> | 2023-10-12 13:58:10 +0200 |
| commit | 3325b080e36afc2660c2f045842901ac7a781972 (patch) | |
| tree | a138e517452a12f7c97e08aab4cbc6048deb02e3 | |
| parent | aac6b89e245086b8bb0ad890cbcdf776894caf3a (diff) | |
tdf#157613 make sure surface is not a null pointer
Change-Id: I8e3c1be3f05f7ccc1f3ba00093cd71a564e5ae9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157848
Reviewed-by: Patrick Luby <plubius@neooffice.org>
Tested-by: Patrick Luby <plubius@neooffice.org>
(cherry picked from commit bacdae0d6b0cec4de39812496f6ffafe04629411)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157871
Tested-by: Jenkins
(cherry picked from commit e65162fcd7091ee315637301fcc1a3480325f918)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157872
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | vcl/skia/osx/gdiimpl.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx index fcb2d2181fc4..24847a410e7a 100644 --- a/vcl/skia/osx/gdiimpl.cxx +++ b/vcl/skia/osx/gdiimpl.cxx @@ -214,6 +214,11 @@ bool AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n const tools::Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue) { + // tdf#157613 make sure surface is not a nullptr + checkSurface(); + if (!mSurface) + return false; + // rControlRegion is not the whole area that the control should be painted to (e.g. highlight // around focused lineedit is outside of it). Since we draw to a temporary bitmap, we need tofind out // the real size. Using getNativeControlRegion() might seem like the function to call, but we need |