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

[Caolán McNamara (via logerrit)]

 vcl/source/gdi/regband.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f90d45790df4d1ceda866277d8d603e3528392e8
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 16 15:14:55 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 16 16:15:23 2023 +0000

    ofz#56020 Null-dereference READ
    
    Change-Id: Id80522c807ac58144b1ec978251a13012e1c8ad5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147158
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 675d99bc0975..91d292519faf 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -815,15 +815,16 @@ bool ImplRegionBand::Contains( tools::Long nX )
 
 tools::Long ImplRegionBand::GetXLeftBoundary() const
 {
-    assert(mpFirstSep && "ImplRegionBand::XLeftBoundary -> no separation in 
band!");
+    SAL_WARN_IF(mpFirstSep == nullptr, "vcl", "ImplRegionBand::XLeftBoundary 
-> no separation in band!");
 
-    return mpFirstSep->mnXLeft;
+    return mpFirstSep ? mpFirstSep->mnXLeft : 0;
 }
 
 tools::Long ImplRegionBand::GetXRightBoundary() const
 {
     SAL_WARN_IF( mpFirstSep == nullptr, "vcl", "ImplRegionBand::XRightBoundary 
-> no separation in band!" );
-
+    if (!mpFirstSep)
+        return 0;
     // search last separation
     ImplRegionBandSep* pSep = mpFirstSep;
     while ( pSep->mpNextSep )