vcl/skia/osx/gdiimpl.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 0224f024424c76a05e0c20b6ee1b4490fde11607
Author: Patrick Luby <[email protected]>
AuthorDate: Wed Oct 11 14:36:12 2023 -0400
Commit: Patrick Luby <[email protected]>
CommitDate: Thu Oct 12 00:17:36 2023 +0200
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 <[email protected]>
Tested-by: Patrick Luby <[email protected]>
(cherry picked from commit bacdae0d6b0cec4de39812496f6ffafe04629411)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157870
Tested-by: Jenkins
diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx
index fd0bdca04333..937a6e40f520 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
