[[ Bug 20971 ]] Unary function parsing does not check for EOL

livecodemiriam · livecodemiriam · commit b930e52bdad1 · 2018-03-06T10:57:26.000Z
diff --git a/docs/notes/bugfix-20971.md b/docs/notes/bugfix-20971.md
@@ -0,0 +1 @@
+# Throw parse error when unary function has no params
diff --git a/engine/src/funcs.h b/engine/src/funcs.h
@@ -27,6 +27,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include "exec.h"
 #include "param.h"
+#include "scriptpt.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -93,7 +94,7 @@ class MCUnaryFunctionCtxt: public MCUnaryFunction
 
     virtual Parse_stat parse(MCScriptPoint &sp, Boolean the)
     {
-        if (get1param(sp, &m_expression, the) != PS_NORMAL)
+        if (sp.is_eol() || get1param(sp, &m_expression, the) != PS_NORMAL)
         {
             MCperror -> add(ParseError, sp);
             return PS_ERROR;
diff --git a/tests/lcs/parser/unary-function.parsertest b/tests/lcs/parser/unary-function.parsertest
@@ -0,0 +1,23 @@
+%% Copyright (C) 2018 LiveCode Ltd.
+%%
+%% This file is part of LiveCode.
+%%
+%% LiveCode is free software; you can redistribute it and/or modify it under
+%% the terms of the GNU General Public License v3 as published by the Free
+%% Software Foundation.
+%%
+%% LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+%% WARRANTY; without even the implied warranty of MERCHANTABILITY or
+%% FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+%% for more details.
+%%
+%% You should have received a copy of the GNU General Public License
+%% along with LiveCode.  If not see <http://www.gnu.org/licenses/>.
+
+%TEST UnaryFunctionNoParams
+on parse_test
+	get the fontlanguage %{AFTER_FUNCTION}
+end parse_test
+%EXPECT PASS
+%ERROR PE_FONTNAMES_BADPARAM AT AFTER_FUNCTION
+%ENDTEST

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Throw parse error when unary function has no params`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */`
`27`	`27`
`28`	`28`	`#include "exec.h"`
`29`	`29`	`#include "param.h"`
	`30`	`+#include "scriptpt.h"`
`30`	`31`
`31`	`32`	`////////////////////////////////////////////////////////////////////////////////`
`32`	`33`
`@@ -93,7 +94,7 @@ class MCUnaryFunctionCtxt: public MCUnaryFunction`
`93`	`94`
`94`	`95`	`virtual Parse_stat parse(MCScriptPoint &sp, Boolean the)`
`95`	`96`	`{`
`96`		`- if (get1param(sp, &m_expression, the) != PS_NORMAL)`
	`97`	`+ if (sp.is_eol() \|\| get1param(sp, &m_expression, the) != PS_NORMAL)`
`97`	`98`	`{`
`98`	`99`	`MCperror -> add(ParseError, sp);`
`99`	`100`	`return PS_ERROR;`