RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-08 10:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: lua: longjmp function must be unregistered

Browse Source 
the longjmp function must be unregistered when we leaves the function
who install it.
This commit is contained in:
Thierry FOURNIER 2015-09-25 23:51:34 +02:00 committed by Willy Tarreau
parent 7a4501757f
commit 10e5bc76c7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hlua.c
View File

@ -4137,6 +4137,7 @@ static int hlua_sample_conv_wrapper(const struct arg *arg_p, struct sample *smp,
/* Check stack available size. */ /* Check stack available size. */
if (!lua_checkstack(stream->hlua.T, 1)) { if (!lua_checkstack(stream->hlua.T, 1)) {
SEND_ERR(stream->be, "Lua converter '%s': full stack.\n", fcn->name); SEND_ERR(stream->be, "Lua converter '%s': full stack.\n", fcn->name);
RESET_SAFE_LJMP(stream->hlua.T);
return 0; return 0;
} }
@ -4146,6 +4147,7 @@ static int hlua_sample_conv_wrapper(const struct arg *arg_p, struct sample *smp,
/* convert input sample and pust-it in the stack. */ /* convert input sample and pust-it in the stack. */
if (!lua_checkstack(stream->hlua.T, 1)) { if (!lua_checkstack(stream->hlua.T, 1)) {
SEND_ERR(stream->be, "Lua converter '%s': full stack.\n", fcn->name); SEND_ERR(stream->be, "Lua converter '%s': full stack.\n", fcn->name);
RESET_SAFE_LJMP(stream->hlua.T);
return 0; return 0;
} }
hlua_smp2lua(stream->hlua.T, smp); hlua_smp2lua(stream->hlua.T, smp);
@ -4156,6 +4158,7 @@ static int hlua_sample_conv_wrapper(const struct arg *arg_p, struct sample *smp,
for (; arg_p->type != ARGT_STOP; arg_p++) { for (; arg_p->type != ARGT_STOP; arg_p++) {
if (!lua_checkstack(stream->hlua.T, 1)) { if (!lua_checkstack(stream->hlua.T, 1)) {
SEND_ERR(stream->be, "Lua converter '%s': full stack.\n", fcn->name); SEND_ERR(stream->be, "Lua converter '%s': full stack.\n", fcn->name);
RESET_SAFE_LJMP(stream->hlua.T);
return 0; return 0;
} }
hlua_arg2lua(stream->hlua.T, arg_p); hlua_arg2lua(stream->hlua.T, arg_p);
@ -4236,6 +4239,7 @@ static int hlua_sample_fetch_wrapper(const struct arg *arg_p, struct sample *smp
/* Check stack available size. */ /* Check stack available size. */
if (!lua_checkstack(stream->hlua.T, 2)) { if (!lua_checkstack(stream->hlua.T, 2)) {
SEND_ERR(smp->px, "Lua sample-fetch '%s': full stack.\n", fcn->name); SEND_ERR(smp->px, "Lua sample-fetch '%s': full stack.\n", fcn->name);
RESET_SAFE_LJMP(stream->hlua.T);
return 0; return 0;
} }
@ -4245,6 +4249,7 @@ static int hlua_sample_fetch_wrapper(const struct arg *arg_p, struct sample *smp
/* push arguments in the stack. */ /* push arguments in the stack. */
if (!hlua_txn_new(stream->hlua.T, stream, smp->px)) { if (!hlua_txn_new(stream->hlua.T, stream, smp->px)) {
SEND_ERR(smp->px, "Lua sample-fetch '%s': full stack.\n", fcn->name); SEND_ERR(smp->px, "Lua sample-fetch '%s': full stack.\n", fcn->name);
RESET_SAFE_LJMP(stream->hlua.T);
return 0; return 0;
} }
stream->hlua.nargs = 1; stream->hlua.nargs = 1;
@ -4254,10 +4259,12 @@ static int hlua_sample_fetch_wrapper(const struct arg *arg_p, struct sample *smp
/* Check stack available size. */ /* Check stack available size. */
if (!lua_checkstack(stream->hlua.T, 1)) { if (!lua_checkstack(stream->hlua.T, 1)) {
SEND_ERR(smp->px, "Lua sample-fetch '%s': full stack.\n", fcn->name); SEND_ERR(smp->px, "Lua sample-fetch '%s': full stack.\n", fcn->name);
RESET_SAFE_LJMP(stream->hlua.T);
return 0; return 0;
} }
if (!lua_checkstack(stream->hlua.T, 1)) { if (!lua_checkstack(stream->hlua.T, 1)) {
SEND_ERR(smp->px, "Lua sample-fetch '%s': full stack.\n", fcn->name); SEND_ERR(smp->px, "Lua sample-fetch '%s': full stack.\n", fcn->name);
RESET_SAFE_LJMP(stream->hlua.T);
return 0; return 0;
} }
hlua_arg2lua(stream->hlua.T, arg_p); hlua_arg2lua(stream->hlua.T, arg_p);
@ -4476,6 +4483,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px,
if (!lua_checkstack(s->hlua.T, 1)) { if (!lua_checkstack(s->hlua.T, 1)) {
SEND_ERR(px, "Lua function '%s': full stack.\n", SEND_ERR(px, "Lua function '%s': full stack.\n",
rule->arg.hlua_rule->fcn.name); rule->arg.hlua_rule->fcn.name);
RESET_SAFE_LJMP(s->hlua.T);
return ACT_RET_CONT; return ACT_RET_CONT;
} }
@ -4486,6 +4494,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px,
if (!hlua_txn_new(s->hlua.T, s, px)) { if (!hlua_txn_new(s->hlua.T, s, px)) {
SEND_ERR(px, "Lua function '%s': full stack.\n", SEND_ERR(px, "Lua function '%s': full stack.\n",
rule->arg.hlua_rule->fcn.name); rule->arg.hlua_rule->fcn.name);
RESET_SAFE_LJMP(s->hlua.T);
return ACT_RET_CONT; return ACT_RET_CONT;
} }
s->hlua.nargs = 1; s->hlua.nargs = 1;
@ -4495,6 +4504,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px,
if (!lua_checkstack(s->hlua.T, 1)) { if (!lua_checkstack(s->hlua.T, 1)) {
SEND_ERR(px, "Lua function '%s': full stack.\n", SEND_ERR(px, "Lua function '%s': full stack.\n",
rule->arg.hlua_rule->fcn.name); rule->arg.hlua_rule->fcn.name);
RESET_SAFE_LJMP(s->hlua.T);
return ACT_RET_CONT; return ACT_RET_CONT;
} }
lua_pushstring(s->hlua.T, *arg); lua_pushstring(s->hlua.T, *arg);