[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sccomp/source

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 30 15:18:42 UTC 2020


 sccomp/source/solver/SwarmSolver.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 46c7afff5beda0494d0201dd99f90b920d3c1860
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Jul 28 10:09:02 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Jul 30 17:18:08 2020 +0200

    tdf#135211: fix crash Swarm Non Linear Solver with blank input
    
    See bt here:
    https://bugs.documentfoundation.org/attachment.cgi?id=163668
    
    Change-Id: I78f59e420aa183399f650915c7c28a138b8ed444
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99572
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 2d150393479bd010c8758b1a1b712f8fb4ce4024)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99546
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 2080c4e2a4852538d3739d70e3c706ec3fc8fb28)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99736
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sccomp/source/solver/SwarmSolver.cxx b/sccomp/source/solver/SwarmSolver.cxx
index c15745cf7eee..f7961b66d053 100644
--- a/sccomp/source/solver/SwarmSolver.cxx
+++ b/sccomp/source/solver/SwarmSolver.cxx
@@ -501,6 +501,8 @@ void SAL_CALL SwarmSolver::solve()
 
     maStatus.clear();
     mbSuccess = false;
+    if (!maVariables.getLength())
+        return;
 
     maBounds.resize(maVariables.getLength());
 


More information about the Libreoffice-commits mailing list