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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8par.cxx         |    3 ++-
 vcl/backendtest/outputdevice/common.cxx |    2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e7fe47fdea4ab7d226e752b11e21b178060ac870
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 13 15:43:36 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Aug 13 20:05:29 2021 +0200

    cid#1490212 try and silence bogus divide by zero Untrusted divisor
    
    Change-Id: I132d01c6007cd1da47f7dc405cfc3c4967757241
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120464
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 851656dc8216..3cd81b1c95eb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1022,8 +1022,9 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
             sal_uInt16 nNumElemVert(0), nNumElemMemVert(0), nElemSizeVert(0);
             rSt.ReadUInt16( nNumElemVert ).ReadUInt16( nNumElemMemVert 
).ReadUInt16( nElemSizeVert );
             bool bOk = false;
-            if (nNumElemVert && ((nElemSizeVert == 8) || (nElemSizeVert == 4)))
+            if (nNumElemVert && (nElemSizeVert == 8 || nElemSizeVert == 4))
             {
+                assert(nElemSizeVert == 8 || nElemSizeVert == 4);
                 //check if there is enough data in the file to make the
                 //record sane
                 bOk = rSt.remainingSize() / nElemSizeVert >= nNumElemVert;
commit 9b564e8b32be960b1be2caa377a52e84606270bb
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 13 15:34:44 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Aug 13 20:05:14 2021 +0200

    cid#1490210 silence Arguments in wrong order
    
    Change-Id: I8767fe556142ec7e3254eaff56bbb1b4eb8322e4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120462
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/backendtest/outputdevice/common.cxx 
b/vcl/backendtest/outputdevice/common.cxx
index b5654c5c45e3..d205bf3b7488 100644
--- a/vcl/backendtest/outputdevice/common.cxx
+++ b/vcl/backendtest/outputdevice/common.cxx
@@ -745,6 +745,7 @@ TestResult OutputDeviceTestCommon::checkHalfEllipse(Bitmap& 
rBitmap, bool aEnabl
     {
         for (tools::Long y = 0; y < pAccess->Height(); ++y)
         {
+            // coverity[swapped_arguments : FALSE] - this is in the correct 
order
             if (SetPixels[{ y, x }])
             {
                 if (aEnableAA)
@@ -790,6 +791,7 @@ TestResult 
OutputDeviceTestCommon::checkClosedBezier(Bitmap& rBitmap)
     {
         for (tools::Long y = 0; y < pAccess->Height(); ++y)
         {
+            // coverity[swapped_arguments : FALSE] - this is in the correct 
order
             if (SetPixels[{ y, x }])
             {
                 checkValue(pAccess, x, y, constLineColor, nNumberOfQuirks, 
nNumberOfErrors, true);