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

[Libreoffice Gerrit user]

 sc/source/core/tool/compiler.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 983b234bd566e98fb78ea1e19d4c874b4cb24c6e
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Thu Aug 2 14:05:25 2018 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Thu Aug 2 15:36:31 2018 +0200

    add invalid argument check to HandleIIOpCode()
    
    This should have been part of 6b8be4b2aaca5.
    
    Change-Id: I6f0263b014d0d7aa4622884922bca218c85ce29d
    Reviewed-on: https://gerrit.libreoffice.org/58473
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 534c66491426..899871d42404 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5839,6 +5839,9 @@ void ScCompiler::HandleIIOpCode(FormulaToken* token, FormulaToken*** pppToken, s
 // return true if opcode is handled
 bool ScCompiler::HandleIIOpCodeInternal(FormulaToken* token, FormulaToken*** pppToken, sal_uInt8 nNumParams)
 {
+    if (nNumParams > 0 && *pppToken[0] == nullptr)
+        return false; // Bad expression (see the dummy creation in FormulaCompiler::CompileTokenArray())
+
     const OpCode nOpCode = token->GetOpCode();
 
     if (nOpCode == ocPush)