core.git: 2 commits - chart2/source sfx2/source

[Caolán McNamara (via logerrit)]

 chart2/source/tools/XMLRangeHelper.cxx |    3 ++-
 sfx2/source/control/bindings.cxx       |   12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit e32ab825cb0566b55011f630ed7b79df0fd6e04c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Oct 5 20:59:42 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Oct 6 17:13:42 2024 +0200

    cid#1608393 silence Overflowed constant
    
    this code seems to be duplicated in
    sw/source/core/unocore/XMLRangeHelper.cxx
    too
    
    Change-Id: Ib41edfa33a72f32dff1f6720e6b0f356e9773f18
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174556
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/chart2/source/tools/XMLRangeHelper.cxx 
b/chart2/source/tools/XMLRangeHelper.cxx
index 1a7e789d3098..419c75924926 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -131,8 +131,9 @@ void lcl_getSingleCellAddressFromXMLString(
         rOutCell.bRelativeRow = true;
 
     // parse rest for column
+    assert(i <= 6);
     sal_Int32 nPower = 1;
-    while( rtl::isAsciiAlpha( pStrArray[ i ] ))
+    while( i >= 0 && rtl::isAsciiAlpha( pStrArray[ i ] ))
     {
         nColumn += (rtl::toAsciiUpperCase(pStrArray[ i ]) - aLetterA + 1) * 
nPower;
         i--;
commit cc19fb1550234b3e1eae3fb50fbf791d84b0ebe1
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Oct 5 21:06:06 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Oct 6 17:13:28 2024 +0200

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

diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index ffafadfeb2a6..af9129e455c1 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -187,8 +187,8 @@ void SfxBindings::DeleteControllers_Impl()
 {
     // in the first round delete Controllers
     std::size_t nCount = pImpl->pCaches.size();
-    std::size_t nCache;
-    for ( nCache = 0; nCache < nCount; ++nCache )
+    std::size_t nCache = 0;
+    while (nCache < nCount)
     {
         // Remember were you are
         SfxStateCache *pCache = pImpl->pCaches[nCache].get();
@@ -199,11 +199,15 @@ void SfxBindings::DeleteControllers_Impl()
         if ( nNewCount < nCount )
         {
             nCache = GetSlotPos(nSlotId);
+            nCount = nNewCount;
             if ( nCache >= nNewCount ||
                  nSlotId != pImpl->pCaches[nCache]->GetId() )
-                --nCache;
-            nCount = nNewCount;
+            {
+                continue;
+            }
         }
+
+        ++nCache;
     }
 
     // Delete all Caches