mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-08 08:07:10 +02:00
Code Issues Projects Releases Wiki Activity

Revert "BUILD: lua: silence some compiler warnings about potential null derefs"

Browse Source 
This reverts commit f1ffb39b61.

It breaks Lua causing some timeouts. Removing the __unreachable() statement
from WILL_LJMP() fixes it. It's very strange and unclear whether it's an
issue with WILL_LJMP() not fullfilling its promise of not returning, if
the code emitted with __unreachable() gets broken, or anything else. Let's
revert this for now.
This commit is contained in:
Willy Tarreau 2018-10-16 17:32:55 +02:00
parent a9c0252b2e
commit 526aed219f
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hlua.c
View File

@ -25,7 +25,6 @@
#include <ebpttree.h> #include <ebpttree.h>
#include <common/cfgparse.h> #include <common/cfgparse.h>
#include <common/compiler.h>
#include <common/xref.h> #include <common/xref.h>
#include <common/hathreads.h> #include <common/hathreads.h>
@ -68,7 +67,7 @@
* MAY_LJMP() marks an lua function that may use longjmp. * MAY_LJMP() marks an lua function that may use longjmp.
*/ */
#define __LJMP #define __LJMP
#define WILL_LJMP(func) do { func; __unreachable(); } while (0) #define WILL_LJMP(func) func
#define MAY_LJMP(func) func #define MAY_LJMP(func) func
/* This couple of function executes securely some Lua calls outside of /* This couple of function executes securely some Lua calls outside of
@ -2362,7 +2361,7 @@ __LJMP static int hlua_socket_connect_yield(struct lua_State *L, int status, lua
return 2; return 2;
} }
appctx = __objt_appctx(s->si[0].end); appctx = objt_appctx(s->si[0].end);
/* Check for connection established. */ /* Check for connection established. */
if (appctx->ctx.hlua_cosocket.connected) { if (appctx->ctx.hlua_cosocket.connected) {
@ -2474,7 +2473,7 @@ __LJMP static int hlua_socket_connect(struct lua_State *L)
} }
hlua = hlua_gethlua(L); hlua = hlua_gethlua(L);
appctx = __objt_appctx(s->si[0].end); appctx = objt_appctx(s->si[0].end);
/* inform the stream that we want to be notified whenever the /* inform the stream that we want to be notified whenever the
* connection completes. * connection completes.
@ -5724,9 +5723,6 @@ static int hlua_register_task(lua_State *L)
WILL_LJMP(luaL_error(L, "Lua out of memory error.")); WILL_LJMP(luaL_error(L, "Lua out of memory error."));
task = task_new(MAX_THREADS_MASK); task = task_new(MAX_THREADS_MASK);
if (!task)
WILL_LJMP(luaL_error(L, "Lua out of memory error."));
task->context = hlua; task->context = hlua;
task->process = hlua_process_task; task->process = hlua_process_task;