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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/docvw/edtwin.cxx            |    2 +-
 vcl/source/bitmap/BitmapScaleSuperFilter.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 759cda89d8aa33e90a617b0625d251af8e9b35e4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 22 11:15:52 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 22 15:07:57 2019 +0200

    cid#1448223 Dereference after null check
    
    Change-Id: I2c8909d7005442532054596c681d96dfc6f5d462
    Reviewed-on: https://gerrit.libreoffice.org/76106
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 8087d1dca59f..e37b3aabe040 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3642,7 +3642,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         // position or on position after field depending on which
                         // half of the field was clicked on.
                         SwTextAttr const*const pTextField(aFieldAtPos.pFndTextAttr);
-                        if (rSh.GetCurrentShellCursor().GetPoint()->nContent
+                        if (pTextField && rSh.GetCurrentShellCursor().GetPoint()->nContent
                                 .GetIndex() != pTextField->GetStart())
                         {
                             assert(rSh.GetCurrentShellCursor().GetPoint()->nContent
commit 21c8f494bde8c3c52a8051b7cfa845dbe154bae4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 22 09:43:04 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 22 15:07:44 2019 +0200

    cid#1448542 Unintended sign extension
    
    Change-Id: I8673f177a0ae6fe9bfd6e2ee7a87f80b058bb24f
    Reviewed-on: https://gerrit.libreoffice.org/76104
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index acb3ad04f2a3..9ee6e80c7b40 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -800,9 +800,9 @@ void scaleDown24bit(ScaleContext &rCtx, long nStartY, long nEndY)
                 Scanline pTmpY = rCtx.mpSrc->GetScanline(nLineStart + i);
                 Scanline pTmpX = pTmpY + constColorComponents * nRowStart;
 
-                long nSumRow1 = 0;
-                long nSumRow2 = 0;
-                long nSumRow3 = 0;
+                int nSumRow1 = 0;
+                int nSumRow2 = 0;
+                int nSumRow3 = 0;
                 BilinearWeightType nTotalWeightX = 0;
 
                 for (long j = 0; j <= nRowRange; j++)