From bbe946ac1e8d741536d62224fa9c89651eaaa28e Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Mon, 23 Dec 2019 19:00:46 -0300
Subject: [PATCH] Bail out earlier.
---
src/lua_baselib.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index e5d477549c..20eaa20489 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -2660,6 +2660,10 @@ static int lib_gAddGametype(lua_State *L)
if (!lua_lumploading)
return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
+ // Ran out of gametype slots
+ if (gametypecount == NUMGAMETYPEFREESLOTS)
+ return luaL_error(L, "Ran out of free gametype slots!");
+
#define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to " LUA_QL("G_AddGametype") " (%s)", e);
#define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
@@ -2734,10 +2738,6 @@ static int lib_gAddGametype(lua_State *L)
// pop gametype table
lua_pop(L, 1);
- // Ran out of gametype slots
- if (gametypecount == NUMGAMETYPEFREESLOTS)
- return luaL_error(L, "Ran out of free gametype slots!");
-
// Set defaults
if (gtname == NULL)
gtname = Z_StrDup("Unnamed gametype");
--
GitLab