core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/brdwin.cxx |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 04afe8b86ccb7975c77971ab339b6eaef92c7b9c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Oct 5 20:29:07 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Nov 19 09:31:16 2024 +0100

    cid#1608576 silence Overflowed return value
    
    Change-Id: I131a201cbcbda3415864e357a45f0ac0cd296d7f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176741
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 8429ee33b52d..4946df1ea549 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -343,11 +343,21 @@ tools::Long ImplBorderWindowView::ImplCalcTitleWidth( 
const ImplBorderFrameData*
 
     ImplBorderWindow* pBorderWindow = pData->mpBorderWindow;
     tools::Long nTitleWidth = pBorderWindow->GetTextWidth( 
pBorderWindow->GetText() )+6;
-    nTitleWidth += pData->maCloseRect.GetWidth();
-    nTitleWidth += pData->maDockRect.GetWidth();
-    nTitleWidth += pData->maMenuRect.GetWidth();
-    nTitleWidth += pData->maHideRect.GetWidth();
-    nTitleWidth += pData->maHelpRect.GetWidth();
+    auto nCloseRectWidth = pData->maCloseRect.GetWidth();
+    assert(nCloseRectWidth >= 0 && "coverity 2023.12.2");
+    nTitleWidth += nCloseRectWidth;
+    auto nDockRectWidth = pData->maDockRect.GetWidth();
+    assert(nDockRectWidth >= 0 && "coverity 2023.12.2");
+    nTitleWidth += nDockRectWidth;
+    auto nMenuRectWidth = pData->maMenuRect.GetWidth();
+    assert(nMenuRectWidth >= 0 && "coverity 2023.12.2");
+    nTitleWidth += nMenuRectWidth;
+    auto nHideRectWidth = pData->maHideRect.GetWidth();
+    assert(nHideRectWidth >= 0 && "coverity 2023.12.2");
+    nTitleWidth += nHideRectWidth;
+    auto nHelpRectWidth = pData->maHelpRect.GetWidth();
+    assert(nHelpRectWidth >= 0 && "coverity 2023.12.2");
+    nTitleWidth += nHelpRectWidth;
     nTitleWidth += pData->mnLeftBorder+pData->mnRightBorder;
     return nTitleWidth;
 }