core.git: basic/source

[Alin Andrei Abahnencei (via logerrit)]

 basic/source/runtime/methods.cxx |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit e08ed1d92f083cc604cb25eb284deb21016268fd
Author:     Alin Andrei Abahnencei <alinandrei2...@gmail.com>
AuthorDate: Mon Dec 23 10:57:38 2024 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jan 9 13:15:32 2025 +0100

    tdf#154285 Check upper bound of arguments in SbRtl_Year function
    
    Signed-off-by: Alin Andrei Abahnencei <alinandrei2...@gmail.com>
    Change-Id: Iffffe3988afdc91068e85beaafc5ff1580210ec6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179253
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 0982c591de6c..17b9029b9d72 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2031,15 +2031,10 @@ void SbRtl_Day(StarBASIC *, SbxArray & rPar, bool)
 
 void SbRtl_Year(StarBASIC *, SbxArray & rPar, bool)
 {
-    if (rPar.Count() < 2)
-    {
-        StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
-    }
-    else
-    {
-        sal_Int16 nYear = implGetDateYear(rPar.Get(1)->GetDate());
-        rPar.Get(0)->PutInteger(nYear);
-    }
+    if (rPar.Count() != 2)
+        return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+    sal_Int16 nYear = implGetDateYear(rPar.Get(1)->GetDate());
+    rPar.Get(0)->PutInteger(nYear);
 }
 
 sal_Int16 implGetHour( double dDate )