core.git: 2 commits - connectivity/source lotuswordpro/source

[Caolán McNamara (via logerrit)]

 connectivity/source/commontools/RowFunctionParser.cxx |    8 ++++----
 lotuswordpro/source/filter/lwplayout.cxx              |    9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 4d8b5a91a76262d6dd58342b248e542ddea1fdaf
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jan 2 15:55:11 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jan 2 18:11:53 2024 +0100

    cid#1545462 perturb Resource leak report
    
    to see if this makes a difference
    
    Change-Id: I4017a0e8d514c32a3fef46a2c23e33023e907275
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161547
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/connectivity/source/commontools/RowFunctionParser.cxx 
b/connectivity/source/commontools/RowFunctionParser.cxx
index da4935dc618d..f8799848de9b 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -57,8 +57,8 @@ class ConstantValueExpression : public ExpressionNode
 
 public:
 
-    explicit ConstantValueExpression( ORowSetValueDecoratorRef aValue ) :
-        maValue(std::move( aValue ))
+    explicit ConstantValueExpression(ORowSetValueDecoratorRef aValue)
+        : maValue(std::move(aValue))
     {
     }
     virtual ORowSetValueDecoratorRef evaluate(const 
ODatabaseMetaDataResultSet::ORow& /*_aRow*/ ) const override
@@ -156,7 +156,7 @@ public:
     void operator()( StringIteratorT rFirst,StringIteratorT rSecond) const
     {
         OUString sVal( rFirst, rSecond - rFirst, RTL_TEXTENCODING_UTF8 );
-        mpContext->maOperandStack.push( 
std::make_shared<ConstantValueExpression>( new ORowSetValueDecorator( sVal ) ) 
);
+        
mpContext->maOperandStack.push(std::make_shared<ConstantValueExpression>(ORowSetValueDecoratorRef(new
 ORowSetValueDecorator(sVal))));
     }
 };
 
@@ -173,7 +173,7 @@ public:
     }
     void operator()( sal_Int32 n ) const
     {
-        mpContext->maOperandStack.push( 
std::make_shared<ConstantValueExpression>( new ORowSetValueDecorator( n ) ) );
+        
mpContext->maOperandStack.push(std::make_shared<ConstantValueExpression>(ORowSetValueDecoratorRef(new
 ORowSetValueDecorator(n))));
     }
 };
 
commit dd82bf96ac50f9b98619ec97dfbac4cb1d988183
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jan 2 15:32:33 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jan 2 18:11:41 2024 +0100

    ofz#64860 Timeout
    
    Change-Id: Ib475cbba118f0705b9475dbe61ec1b96a68af47c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161544
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 8a1c85074f80..bc71d3324405 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1959,13 +1959,8 @@ void LwpPlacableLayout::Read()
             sal_uInt16 count = pStrm->QuickReaduInt16();
             if (count)
             {
-                // temporarily added by  to avoid assertion
-                while (count)
-                {
-                    LwpPoint aPoint;
-                    aPoint.Read(pStrm);
-                    count--;
-                }
+                // skip 'count' of LwpPoints, each of which is 2 Int32s
+                pStrm->SeekRel(count * 8);
             }
             pStrm->SkipExtra();
         }