core.git: 2 commits - dbaccess/source sw/source

[Noel Grandin (via logerrit)]

 dbaccess/source/filter/hsqldb/utils.cxx |    3 ++-
 sw/source/core/layout/pagechg.cxx       |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c2306ddbac82e643cf05773ce39fe09195937af6
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Sep 28 14:24:50 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Sep 28 18:08:33 2024 +0200

    cid#1607790 Overflowed constant
    
    Change-Id: Ia2b180d6a93f139a0f83653ee45b4ad929ccef45
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174110
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/dbaccess/source/filter/hsqldb/utils.cxx 
b/dbaccess/source/filter/hsqldb/utils.cxx
index d8addd33623e..4ed05ae5075a 100644
--- a/dbaccess/source/filter/hsqldb/utils.cxx
+++ b/dbaccess/source/filter/hsqldb/utils.cxx
@@ -90,7 +90,7 @@ OUString utils::convertToUTF8(std::string_view original)
 
 OUString utils::getTableNameFromStmt(std::u16string_view sSql)
 {
-    auto stmtComponents = comphelper::string::split(sSql, sal_Unicode(u' '));
+    std::vector<OUString> stmtComponents = comphelper::string::split(sSql, 
sal_Unicode(u' '));
     assert(stmtComponents.size() > 2);
     auto wordIter = stmtComponents.begin();
 
@@ -105,6 +105,7 @@ OUString utils::getTableNameFromStmt(std::u16string_view 
sSql)
     if (wordIter->indexOf("\"") >= 0)
     {
         size_t nAposBegin = sSql.find('"');
+        assert(nAposBegin != std::u16string_view::npos); // make coverity happy
         size_t nAposEnd = nAposBegin;
         bool bProperEndAposFound = false;
         while (!bProperEndAposFound)
commit f063ea562c6ba14db15b9773bdcbb18af4a72ff8
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Sep 28 14:19:23 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Sep 28 18:08:25 2024 +0200

    cid#1607805 Overflowed constant
    
    Change-Id: Id146853a86a54597a1e07efba6c86abc10d93796
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174109
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index d086166caaef..351ad146d6e0 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -411,6 +411,7 @@ static void lcl_MakeObjs(const 
sw::FrameFormats<sw::SpzFrameFormat*>& rSpzs, SwP
     // formats are in the special table of the document
     for(size_t i = 0; i < rSpzs.size(); ++i )
     {
+        LOOP_START:
         auto pSpz = rSpzs[i];
         const SwFormatAnchor &rAnch = pSpz->GetAnchor();
         if ( rAnch.GetPageNum() == pPage->GetPhyPageNum() )
@@ -434,8 +435,7 @@ static void lcl_MakeObjs(const 
sw::FrameFormats<sw::SpzFrameFormat*>& rSpzs, SwP
             {
                 OSL_FAIL( "DrawObject not found." );
                 pSpz->GetDoc()->DelFrameFormat( pSpz );
-                --i;
-                continue;
+                goto LOOP_START;
             }
             // The object might be anchored to another page, e.g. when 
inserting
             // a new page due to a page descriptor change. In such cases, the