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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Mar 22 13:43:23 UTC 2021


 vcl/source/outdev/bitmap.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 497984bf711191f58a11c11dec05e6e3dcb18430
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Mar 22 10:19:49 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 22 14:42:32 2021 +0100

    cid#1473771 silence Dereference after null check
    
    Change-Id: Ib6e71396faba14aefb372b83b45973688883ee7d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112874
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 9162a67ef732..970b833e0c73 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1460,8 +1460,9 @@ bool OutputDevice::HasFastDrawTransformedBitmap() const
     if( ImplIsRecordLayout() )
         return false;
 
-    if ( !mpGraphics && !AcquireGraphics() )
+    if (!mpGraphics && !AcquireGraphics())
         return false;
+    assert(mpGraphics);
 
     return mpGraphics->HasFastDrawTransformedBitmap();
 }


More information about the Libreoffice-commits mailing list