mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: lua: undetected infinite loop

Browse Source 
If the Lua code causes an infinite loop without yield possible, the
clock is not updated. This patch check the clock when the Lua control
code cannot yield.
This commit is contained in:
Thierry FOURNIER 2015-03-13 14:50:06 +01:00 committed by Willy Tarreau
parent 01c30124ae
commit a85cfb1db5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hlua.c
View File

@ -856,7 +856,8 @@ void hlua_hook(lua_State *L, lua_Debug *ar)
if (lua_isyieldable(L)) if (lua_isyieldable(L))
WILL_LJMP(hlua_yieldk(L, 0, 0, NULL, TICK_ETERNITY, HLUA_CTRLYIELD)); WILL_LJMP(hlua_yieldk(L, 0, 0, NULL, TICK_ETERNITY, HLUA_CTRLYIELD));
/* If we cannot yield, check the timeout. */ /* If we cannot yield, update the clock and check the timeout. */
tv_update_date(0, 1);
if (tick_is_expired(hlua->expire, now_ms)) { if (tick_is_expired(hlua->expire, now_ms)) {
lua_pushfstring(L, "execution timeout"); lua_pushfstring(L, "execution timeout");
WILL_LJMP(lua_error(L)); WILL_LJMP(lua_error(L));