core.git: 2 commits - cppuhelper/source cui/source jvmfwk/source

[Caolán McNamara (via logerrit)]

 cppuhelper/source/servicemanager.cxx |    1 +
 cui/source/customize/cfg.cxx         |    1 +
 jvmfwk/source/framework.cxx          |    3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 037efad7b73f183a5d54808fa12c519276a8e7ce
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Oct 3 09:33:36 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Oct 4 20:30:58 2024 +0200

    cid#1607024 silence Overflowed constant
    
    and
    
    cid#1607900 silence Overflowed constant
    
    Change-Id: I18ef4b6885f872697c272b9fedc6a3e92a0df587
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174492
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/cppuhelper/source/servicemanager.cxx 
b/cppuhelper/source/servicemanager.cxx
index ddc8afcda681..295ca5a034e9 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -1466,6 +1466,7 @@ OUString cppuhelper::ServiceManager::readLegacyRdbString(
     }
     OUString val;
     std::vector< char > v(s); // assuming sal_uInt32 fits into 
vector::size_type
+    assert(s > 0 && "throw above otherwise");
     if (subkey.getValue(OUString(), v.data()) != RegError::NO_ERROR
         || v.back() != '
         || !rtl_convertStringToUString(
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 6907a2dcaaf5..04db1bf78dca 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2983,6 +2983,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
     for (size_t n = 0; n < nCount; ++n)
     {
         sal_uInt16 nId = m_xTbSymbol->GetItemId( n );
+        assert(nId > 0 && "otherwise totally broken");
 
         if ( m_xTbSymbol->GetItemText( nId ) == aURL )
         {
commit ed75a40d3c971ed9b74a0a130d9d082bdf751589
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Oct 3 13:07:51 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Oct 4 20:30:43 2024 +0200

    cid#1606631 Overflowed constant
    
    Change-Id: I5dda80aaa2fa7ec47ad005048ec3738481e5b50c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174491
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index eea9cc92c388..a20d08fd1a99 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -159,7 +159,8 @@ std::vector<OUString> 
jfw_convertUserPathList(std::u16string_view sUserPath)
                 if (nBootstrapVarEnd == std::u16string_view::npos)
                 {
                     // Current colon is part of bootstrap variable - skip it!
-                    nextColon = sUserPath.find(SAL_PATHSEPARATOR, nextColon + 
1);
+                    const auto nAfterColon = (nextColon != 
std::string_view::npos) ? (nextColon + 1) : 0;
+                    nextColon = sUserPath.find(SAL_PATHSEPARATOR, nAfterColon);
                     if (nextColon != 0 && nextColon != 
std::u16string_view::npos)
                         sToken = sUserPath.substr(nIdx, nextColon - nIdx);
                     else