From 2dd5f1abe3212eb9d6f2b9ee8e6127900fc68f6e Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Tue, 20 Aug 2019 18:18:29 +0100
Subject: [PATCH] Fixes for lib_cvRegisterVar (the Lua version of
CV_RegisterVar): * Make sure the consvar's properties are all initialised to
zeros as defaults * Error if the consvar is not given a name * Error if the
consvar has CV_CALL but no call function * Error if the consvar has CV_NOINIT
but not CV_CALL
---
src/lua_consolelib.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index dced4e43c1..7766ba1c2a 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -303,6 +303,8 @@ static int lib_cvRegisterVar(lua_State *L)
#define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to " LUA_QL("CV_RegisterVar") " (%s)", e);
#define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
+ memset(cvar, 0x00, sizeof(consvar_t)); // zero everything by default
+
lua_pushnil(L);
while (lua_next(L, 1)) {
// stack: cvar table, cvar userdata, key/index, value
@@ -390,6 +392,13 @@ static int lib_cvRegisterVar(lua_State *L)
#undef FIELDERROR
#undef TYPEERROR
+ if (!cvar->name)
+ return luaL_error(L, M_GetText("Variable has no name!\n"));
+ if ((cvar->flags & CV_NOINIT) && !(cvar->flags & CV_CALL))
+ return luaL_error(L, M_GetText("Variable %s has CV_NOINIT without CV_CALL\n"), cvar->name);
+ if ((cvar->flags & CV_CALL) && !cvar->func)
+ return luaL_error(L, M_GetText("Variable %s has CV_CALL without a function\n"), cvar->name);
+
// stack: cvar table, cvar userdata
lua_getfield(L, LUA_REGISTRYINDEX, "CV_Vars");
I_Assert(lua_istable(L, 3));
--
GitLab