core.git: 2 commits - basegfx/source tools/source

[Caolán McNamara (via logerrit)]

 basegfx/source/polygon/b2dpolygontools.cxx |    5 ++---
 tools/source/fsys/urlobj.cxx               |    3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 792a4768e1765b6d1f78d8bd5ca9b2a5abfd0a13
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed May 1 20:22:06 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu May 2 00:13:41 2024 +0200

    cid#1596705 Unused value
    
    Change-Id: Ie5bfe55fd964c05f80d3400a66aa79886f3c144b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166983
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/basegfx/source/polygon/b2dpolygontools.cxx 
b/basegfx/source/polygon/b2dpolygontools.cxx
index 92beaa21fd0a..89c8eea90111 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3328,12 +3328,11 @@ namespace basegfx::utils
 
                 // get first point and flag
                 B2DPoint aNewCoordinatePair(rPointSequenceSource[0].X, 
rPointSequenceSource[0].Y);
-                css::drawing::PolygonFlags 
ePolygonFlag(rFlagSequenceSource[0]);
                 B2DPoint aControlA;
                 B2DPoint aControlB;
 
                 // first point is not allowed to be a control point
-                OSL_ENSURE(ePolygonFlag != css::drawing::PolygonFlags_CONTROL,
+                OSL_ENSURE(rFlagSequenceSource[0] != 
css::drawing::PolygonFlags_CONTROL,
                     "UnoPolygonBezierCoordsToB2DPolygon: Start point is a 
control point, illegal input polygon (!)");
 
                 // add first point as start point
@@ -3347,7 +3346,7 @@ namespace basegfx::utils
 
                     // get next point and flag
                     aNewCoordinatePair = B2DPoint(rPointSequenceSource[b].X, 
rPointSequenceSource[b].Y);
-                    ePolygonFlag = rFlagSequenceSource[b];
+                    css::drawing::PolygonFlags ePolygonFlag = 
rFlagSequenceSource[b];
                     b++;
 
                     if(b < nCount && ePolygonFlag == 
css::drawing::PolygonFlags_CONTROL)
commit bea8576e8218cc8fee7966877d7412377e70e204
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed May 1 20:19:24 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu May 2 00:13:32 2024 +0200

    cid#1596706 Dereference after null check
    
    Change-Id: If7156d9b0aaa392ff0c1e98dfdd4d05c6dcaabce
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166982
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index aeb85c1c9f1d..611a14145dde 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2274,7 +2274,8 @@ INetURLObject::PrefixInfo const * 
INetURLObject::getPrefix(sal_Unicode const *&
     sal_Int32 i = 0;
     for (; pFirst < pLast; ++i)
     {
-        if (pFirst->m_pPrefix && pFirst->m_pPrefix[i] == '
+        assert(pFirst->m_pPrefix && "we start search after the dummy entry");
+        if (pFirst->m_pPrefix[i] == '
         {
             pMatch = pFirst++;
             pMatched = p;