disallow malformed ffi.typeof inputs

q66 · Nov 1, 2022 · d762282 · d762282
1 parent 559c978
commit d762282
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/parser.cc b/src/parser.cc
@@ -2677,7 +2677,7 @@ ast::c_type parse_type(
     {
         lex_state ls{L, input, iend, PARSE_MODE_NOTCDEF, paridx};
         ast::c_type tp{};
-        if (!ls.get() || !parse_type(ls, tp)) {
+        if (!ls.get() || !parse_type(ls, tp) || !check(ls, -1)) {
             if (ls.err_token() > 0) {
                 char buf[16];
                 lua_pushfstring(

diff --git a/tests/istype.lua b/tests/istype.lua
@@ -36,3 +36,12 @@ assert(not ffi.istype("int &", ffi.typeof("float &")))
 -- second argument must be a cval
 assert(not ffi.istype("int", "int"))
 assert(not ffi.istype("int", true))
+
+-- types in typeof must be terminated
+local ret, msg = pcall(ffi.typeof, "long int bla")
+assert(not ret)
+assert(msg == "'<eof>' expected near '<name>'")
+
+local ret, msg = pcall(ffi.typeof, "long int int")
+assert(not ret)
+assert(msg == "'<eof>' expected near 'int'")