From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 11 Mar 2019 03:36:23 +0000 (+0800)
Subject: do_lua doesn't access global instance data
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a43ec8dd22c832caaf6e950dc09a68fba28bfd6;p=thirdparty%2Ffreeradius-server.git

do_lua doesn't access global instance data
---

diff --git a/src/modules/rlm_lua/lua.c b/src/modules/rlm_lua/lua.c
index a126126d24b..be0d165ccd0 100644
--- a/src/modules/rlm_lua/lua.c
+++ b/src/modules/rlm_lua/lua.c
@@ -718,7 +718,7 @@ static int rlm_lua_get_field(lua_State *L, REQUEST *request, char const *field)
 	return 0;
 }
 
-int do_lua(rlm_lua_t const *inst, rlm_lua_thread_t *thread, REQUEST *request, char const *funcname)
+int do_lua(rlm_lua_thread_t *thread, REQUEST *request, char const *funcname)
 {
 	fr_cursor_t cursor;
 	lua_State *L = thread->interpreter;
diff --git a/src/modules/rlm_lua/lua.h b/src/modules/rlm_lua/lua.h
index 7742a88de6c..f960781e8d5 100644
--- a/src/modules/rlm_lua/lua.h
+++ b/src/modules/rlm_lua/lua.h
@@ -77,7 +77,7 @@ typedef struct {
 
 /* lua.c */
 int rlm_lua_init(lua_State **out, rlm_lua_t const *instance);
-int do_lua(rlm_lua_t const *inst, rlm_lua_thread_t *thread, REQUEST *request, char const *funcname);
+int do_lua(rlm_lua_thread_t *thread, REQUEST *request, char const *funcname);
 bool rlm_lua_isjit(lua_State *L);
 char const *rlm_lua_version(lua_State *L);
 
diff --git a/src/modules/rlm_lua/rlm_lua.c b/src/modules/rlm_lua/rlm_lua.c
index 567e3aeca62..a41342a6ec2 100644
--- a/src/modules/rlm_lua/rlm_lua.c
+++ b/src/modules/rlm_lua/rlm_lua.c
@@ -68,12 +68,8 @@ static const CONF_PARSER module_config[] = {
 #define DO_LUA(_s)\
 static rlm_rcode_t mod_##_s(void *instance, void *thread, REQUEST *request) {\
 	rlm_lua_t const *inst = instance;\
-	if (!inst->func_##_s) {\
-		return RLM_MODULE_NOOP;\
-	}\
-	if (do_lua(inst, thread, request, inst->func_##_s) < 0) {\
-		return RLM_MODULE_FAIL;\
-	}\
+	if (!inst->func_##_s) return RLM_MODULE_NOOP;\
+	if (do_lua(thread, request, inst->func_##_s) < 0) return RLM_MODULE_FAIL;\
 	return RLM_MODULE_OK;\
 }