[Libreoffice-commits] core.git: 2 commits - desktop/source sc/source

[Caolán McNamara]

 desktop/source/app/appinit.cxx   |    6 +++---
 sc/source/core/tool/interpr3.cxx |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit d2a07cd3214af27c5af601992e3c4a1a6e3b3dad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 9 16:35:33 2015 +0100

    crashtestig: infinite recurse in ooo32833-1.sxc
    
    integralPhi is called with nan(0xfffff000001f6)
    which recurses through rtl_math_erfc->rtl_math_erf->rtl_math_erfc
    until we run out of stack
    
    Change-Id: Iab8a22fb23686d22d151f2508dbeb44ab47a76b7

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index ab9efe9..3f04e4d 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1599,7 +1599,10 @@ void ScInterpreter::ScLogNormDist( int nMinParamCount ) //expanded, see #i100119
 
 void ScInterpreter::ScStdNormDist()
 {
-    PushDouble(integralPhi(GetDouble()));
+    double fVal = GetDouble();
+    if (!rtl::math::isNan(fVal))
+        fVal = integralPhi(fVal);
+    PushDouble(fVal);
 }
 
 void ScInterpreter::ScStdNormDist_MS()
commit 6f70f1c04dbe8c1b11227781b20b50e5b10c93d6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 9 16:35:19 2015 +0100

    afl-eventtesting: we want to allow dialogs in ui-testing mode
    
    Change-Id: Ibd7f88734492c4336e8a92ebbf9c70afdb7b3b5c

diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index b321eef..c41880e 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -97,9 +97,9 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context)
         // interpret command line arguments
         CommandLineArgs& rCmdLine = GetCommandLineArgs();
 
-        // Headless mode for FAT Office
-        bool bHeadlessMode = rCmdLine.IsHeadless();
-        if ( bHeadlessMode )
+        // Headless mode for FAT Office, auto cancels any dialogs that popup
+        bool bHeadlessMode = rCmdLine.IsHeadless() && !rCmdLine.IsEventTesting();
+        if (bHeadlessMode)
             Application::EnableHeadlessMode(false);
 
         // read accept string from configuration