From 97dce0fe6348121446c84673d74174ae5278bbe7 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 4 Aug 2013 20:37:40 +0000
Subject: [PATCH] Lunatic: sanity-check some arguments passed to con.action().

git-svn-id: https://svn.eduke32.com/eduke32@3974 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/lunatic/control.lua | 48 ++++++++++++++++------
 polymer/eduke32/source/lunatic/lunacon.lua |  2 +-
 polymer/eduke32/source/lunatic/test.lua    |  4 +-
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/polymer/eduke32/source/lunatic/control.lua b/polymer/eduke32/source/lunatic/control.lua
index 3d98b9a51..2dbf41aaa 100644
--- a/polymer/eduke32/source/lunatic/control.lua
+++ b/polymer/eduke32/source/lunatic/control.lua
@@ -46,6 +46,14 @@ local sector, wall, sprite = dc.sector, dc.wall, dc.sprite
 local wallsofsect = dc.wallsofsect
 local spritesofsect, spritesofstat = dc.spritesofsect, dc.spritesofstat
 
+local check_sector_idx = bcheck.sector_idx
+local check_tile_idx = bcheck.tile_idx
+local check_sprite_idx = bcheck.sprite_idx
+local check_player_idx = bcheck.player_idx
+local check_sound_idx = bcheck.sound_idx
+local check_number = bcheck.number
+local check_type = bcheck.type
+
 local OUR_REQUIRE_STRING = [[
  local _con=require'con'
  local _ga,_av,_pv=_con._gamearray,_con.actorvar,_con.playervar
@@ -76,6 +84,17 @@ local am_ctype_full_const = { action=con_action_ct, move=con_move_ct }
 -- Non-const-qualified 'bare' action and move (without ID):
 local am_ctype_bare = { action=ffi.typeof("struct action"), move=ffi.typeof("struct move") }
 
+-- CODEDUP lunacon.lua
+local function truetab(tab)
+    local ttab = {}
+    for i=1,#tab do
+        ttab[tab[i]] = true
+    end
+    return ttab
+end
+-- CODEDUP lunacon.lua
+local ALLOWED_VIEWTYPE = truetab { 0, 1, 3,4, 5, 7, 8, -5, -7 }
+
 local function def_action_or_move(what, tab)
     if (lastid[what] <= -(2^31)) then
         error("Too many "..what.."s defined", 3);
@@ -102,16 +121,29 @@ local function def_action_or_move(what, tab)
     end
 
     if (what=="action") then
-        -- Special default values
-        if (tab[2]==nil and tab.numframes==nil) then
+        -- Special default values or checking of actor members.
+        -- KEEPINSYNC with ACTOR_CHECK in lunacon.lua for consistency.
+        local numframes, viewtype, incval = tab[2], tab[3], tab[4]
+
+        if (numframes==nil and tab.numframes==nil) then
             am.numframes = 1
+        else
+            check_number(numframes, 4)
+            if (numframes < 0) then
+                error("action has negative number of frames", 3)
+            end
         end
 
-        if (tab[3]==nil and tab.viewtype==nil) then
+        if (viewtype==nil and tab.viewtype==nil) then
             am.viewtype = 1
+        else
+            check_number(viewtype, 4)
+            if (ALLOWED_VIEWTYPE[viewtype] == nil) then
+                error("action has disallowed viewtype "..viewtype, 3)
+            end
         end
 
-        if (tab[4]==nil and tab.incval==nil) then
+        if (incval==nil and tab.incval==nil) then
             am.incval = 1
         end
     end
@@ -173,14 +205,6 @@ end
 
 ---=== RUNTIME CON FUNCTIONS ===---
 
-local check_sector_idx = bcheck.sector_idx
-local check_tile_idx = bcheck.tile_idx
-local check_sprite_idx = bcheck.sprite_idx
-local check_player_idx = bcheck.player_idx
-local check_sound_idx = bcheck.sound_idx
-local check_number = bcheck.number
-local check_type = bcheck.type
-
 -- Will contain [<label>]=number mappings after CON translation.
 local D = { true }
 
diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua
index 9773a1b33..441dd7177 100644
--- a/polymer/eduke32/source/lunatic/lunacon.lua
+++ b/polymer/eduke32/source/lunatic/lunacon.lua
@@ -948,7 +948,7 @@ function Define.composite(labeltype, identifier, ...)
 
     if (labeltype == LABEL.ACTION) then
         -- Sanity-check action members.
-        -- TODO: con.action(), too.
+        -- KEEPINSYNC with ACTOR_CHECK in control.lua for consistency.
         if (not (args[2] >= 0)) then
             errprintf("action \"%s\" has negative number of frames", identifier)
         end
diff --git a/polymer/eduke32/source/lunatic/test.lua b/polymer/eduke32/source/lunatic/test.lua
index 953df1335..d0f1867e3 100644
--- a/polymer/eduke32/source/lunatic/test.lua
+++ b/polymer/eduke32/source/lunatic/test.lua
@@ -164,7 +164,7 @@ checkfail('print(sprite._nextspritesect[4].whatfield)', "attempt to index a numb
 --checkfail("require('os')")
 
 -- we must declare globals with 'gamevar'
-checkfail("new_global = 345", "attempt to write to undeclared variable 'new_global'")
+checkfail("new_global = 345", "attempt to write into the global environment")
 
 -- can't redefine constants in 'gv'
 checkfail('gv.CEILING = 3', "attempt to write to constant location")
@@ -212,6 +212,8 @@ checkfail("local w = player[0].weapon[-1]", "out-of-bounds weapon read access")
 checkfail("player[0].weapon.SHOTGUN.firesound = 1e5", "invalid sound number")
 checkfail("player[0].weapon.SHOTGUN.firesound = 0/0", "must be a non-NaN number")
 checkfail("player[0].weapon.SHOTGUN.firesound = 1/0", "invalid sound number")
+checkfail("gameactor{1680, action=require('con').action{numframes=-10}, function() end}",
+          "action has negative number of frames")
 -- NOTE: It should only be relied on that setting e.g. .firesound to -1 sets it
 -- to 0, not other negative values.
 player[0].weapon.SHOTGUN.firesound = -1/0