[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/skia

[Mike Kaganski (via logerrit)]

 vcl/skia/gdiimpl.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7fddaa7e4f0d914aad910861ffc236bd8e1b44f9
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Aug 17 17:42:43 2020 +0300
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Aug 18 10:40:51 2020 +0200

    Dereference of nullptr
    
    ... opening attachment 164348 from tdf#135799
    
    Change-Id: I7d9b38bf34c7120fee39707ed99a0e6e2c2c84e5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100878
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit b7b4565473b09c771d5a949c394013956f1c4db7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100804
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 66f3655f9c53..7b69df95936f 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -392,6 +392,8 @@ void SkiaSalGraphicsImpl::checkSurface()
 
 void SkiaSalGraphicsImpl::flushDrawing()
 {
+    if (!mSurface)
+        return;
     checkPendingDrawing();
     if (mXorMode)
         applyXor();