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

[Caolán McNamara (via logerrit)]

 svx/source/dialog/svxruler.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 97622503fe7ed58820b7dfc813b3b3ea8f5ad057
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Aug 27 10:28:39 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Aug 27 12:47:21 2022 +0200

    cid#1500455 Dereference after null check
    
    Change-Id: I5cbc1d182821b88514077db5ff2c436f62372bef
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138923
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index e1308ff749c3..4d873c23773e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2902,6 +2902,7 @@ void SvxRuler::CalcMinMax()
                 break;
             }
           case RulerDragSize::N2:
+            if (mxColumnItem)
             {
                 nMaxLeft = lNullPix + mpBorders[nIdx].nPos;
                 if(nIdx == mxColumnItem->Count()-2) { // last column
@@ -2924,7 +2925,7 @@ void SvxRuler::CalcMinMax()
                         nMaxRight += mpBorders[nIdx].nPos +
                             mpBorders[nIdx].nWidth;
                     }
-            }
+                }
                 nMaxRight -= glMinFrame;
                 nMaxRight -= mpBorders[nIdx].nWidth;
                 break;