From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Tue, 4 Jun 2024 13:52:23 +0000 (+0200)
Subject: CLEANUP: hlua: simplify ambiguous lua_insert() usage in hlua_ctx_resume()
X-Git-Tag: v3.1-dev1~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bde0d64ddf0e32257444f14e69adea8f899b74b;p=thirdparty%2Fhaproxy.git

CLEANUP: hlua: simplify ambiguous lua_insert() usage in hlua_ctx_resume()

'lua_insert(lua->T, -lua_gettop(lua->T))' is actually used to rotate the
top value with the bottom one, thus the code was overkill and the comment
was actually misleading, let's fix that by using explicit equivalent form
(absolute index).

It may be backported with 5508db9a2 ("BUG/MINOR: hlua: fix unsafe
lua_tostring() usage with empty stack") to all stable versions to ease
code maintenance.
---

diff --git a/src/hlua.c b/src/hlua.c
index f108c6ed8a..8434ed73a1 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -2087,8 +2087,8 @@ resume_execution:
 			hlua_pushfstring_safe(lua->T, "[state-id %d] unknown runtime error from %s",
 			                      lua->state_id, trace);
 
-		/* Move the error msg at the top and then empty the stack except last msg */
-		lua_insert(lua->T, -lua_gettop(lua->T));
+		/* Move the error msg at the bottom and then empty the stack except last msg */
+		lua_insert(lua->T, 1);
 		lua_settop(lua->T, 1);
 		ret = HLUA_E_ERRMSG;
 		break;
@@ -2113,8 +2113,8 @@ resume_execution:
 			hlua_pushfstring_safe(lua->T, "[state-id %d] message handler error",
 			                      lua->state_id);
 
-		/* Move the error msg at the top and then empty the stack except last msg */
-		lua_insert(lua->T, -lua_gettop(lua->T));
+		/* Move the error msg at the bottom and then empty the stack except last msg */
+		lua_insert(lua->T, 1);
 		lua_settop(lua->T, 1);
 		ret = HLUA_E_ERRMSG;
 		break;