core.git: 2 commits - connectivity/source editeng/source

[Caolán McNamara (via logerrit)]

 connectivity/source/drivers/hsqldb/HStorageAccess.cxx |   16 ++++++++--------
 editeng/source/editeng/impedit2.cxx                   |    2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit b95059acaf33af93606d4459d5e97d5ccdfcce8e
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Aug 17 20:49:49 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Aug 20 11:07:15 2024 +0200

    cid#1607396 silence Overflowed integer argument
    
    Change-Id: I756688604ce80d0e9ca6494826767f49dcc13af1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172095
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index b2d4a1283cff..e4392c73453a 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1275,6 +1275,7 @@ EditPaM ImpEditEngine::CursorUp( const EditPaM& rPaM, 
EditView const * pView )
     const ParaPortion* pPPortion = FindParaPortion( rPaM.GetNode() );
     assert(pPPortion);
     sal_Int32 nLine = pPPortion->GetLineNumber( rPaM.GetIndex() );
+    assert(nLine >= 0);
     const EditLine& rLine = pPPortion->GetLines()[nLine];
 
     tools::Long nX;
@@ -1289,6 +1290,7 @@ EditPaM ImpEditEngine::CursorUp( const EditPaM& rPaM, 
EditView const * pView )
     EditPaM aNewPaM( rPaM );
     if ( nLine )    // same paragraph
     {
+        assert(nLine >= 1);
         const EditLine& rPrevLine = pPPortion->GetLines()[nLine-1];
         aNewPaM.SetIndex(GetChar(*pPPortion, rPrevLine, nX));
         // If a previous automatically wrapped line, and one has to be exactly
commit edb352c241dddbe2afa20dd3a85ad1aacdb77950
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Aug 17 20:54:36 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Aug 20 11:07:07 2024 +0200

    cid#1607042 silence Overflowed integer argument
    
    Change-Id: I416f9f22c6ba464ef6a3416a3a0cebc34f2b6725
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172094
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx 
b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 8d15d487372a..3e874dbbeddc 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -364,22 +364,22 @@ extern "C" SAL_JNI_EXPORT void JNICALL 
Java_com_sun_star_sdbcx_comp_hsqldb_Nativ
         Reference< XOutputStream> xOut = pHelper->getOutputStream();
         OSL_ENSURE(xOut.is(),"No output stream!");
 
-        ::sal_Int64 diff = position - nLen;
-        sal_Int32 n;
-        while( diff != 0 )
+        sal_Int64 diff = position - nLen, n;
+        while (diff != 0)
         {
-            if ( BUFFER_SIZE < diff )
+            if (diff > BUFFER_SIZE)
             {
-                n = static_cast<sal_Int32>(BUFFER_SIZE);
+                n = BUFFER_SIZE;
                 diff = diff - BUFFER_SIZE;
             }
             else
             {
-                n = static_cast<sal_Int32>(diff);
+                n = diff;
                 diff = 0;
             }
-            Sequence< ::sal_Int8 > aData(n);
-            memset(aData.getArray(),0,n);
+            assert(n >= 0 && n <= SAL_MAX_INT32 && "this fits in sal_Int32");
+            Sequence<sal_Int8> aData(n);
+            memset(aData.getArray(), 0, n);
             xOut->writeBytes(aData);
         #ifdef HSQLDB_DBG
             aDataLog.write( aData.getConstArray(), n );