[Libreoffice-commits] core.git: drawinglayer/source

Caolán McNamara caolanm at redhat.com
Tue Jun 12 13:53:37 UTC 2018


 drawinglayer/source/texture/texture3d.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2c771d597f0afcdfa1c246877e57d49ae637fe01
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 12 13:10:30 2018 +0100

    forcepoint#41 assert
    
    Change-Id: I4e5ce65593fed5ddeeb972af8c736535ca9d2298
    Reviewed-on: https://gerrit.libreoffice.org/55682
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index 0dac447ccf50..fc6232022692 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -90,7 +90,8 @@ namespace drawinglayer
                 mpReadTransparence = Bitmap::ScopedReadAccess(maTransparence);
             }
 
-            mpReadBitmap = Bitmap::ScopedReadAccess(maBitmap);
+            if (!!maBitmap)
+                mpReadBitmap = Bitmap::ScopedReadAccess(maBitmap);
             SAL_WARN_IF(!mpReadBitmap, "drawinglayer", "GeoTexSvxBitmapEx: Got no read access to Bitmap");
             if (mpReadBitmap)
             {


More information about the Libreoffice-commits mailing list