RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: hlua: hlua_smp2lua_str() may LJMP 

Add LJMP hint to hlua_smp2lua_str() prototype since it relies on
functions (e.g.: lua_pushstring()) which may raise lua memory errors.
This commit is contained in:
Aurelien DARRAGON 2023-05-17 10:38:50 +02:00 committed by Christopher Faulet
parent 12a815ad19
commit 742b1a8797
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hlua.c
View File

@ -511,7 +511,7 @@ static int hlua_lua2arg(lua_State *L, int ud, struct arg *arg);
__LJMP static int hlua_lua2arg_check(lua_State *L, int first, struct arg *argp, __LJMP static int hlua_lua2arg_check(lua_State *L, int first, struct arg *argp,
uint64_t mask, struct proxy *p); uint64_t mask, struct proxy *p);
static int hlua_smp2lua(lua_State *L, struct sample *smp); static int hlua_smp2lua(lua_State *L, struct sample *smp);
static int hlua_smp2lua_str(lua_State *L, struct sample *smp); __LJMP static int hlua_smp2lua_str(lua_State *L, struct sample *smp);
static int hlua_lua2smp(lua_State *L, int ud, struct sample *smp); static int hlua_lua2smp(lua_State *L, int ud, struct sample *smp);
__LJMP static int hlua_http_get_headers(lua_State *L, struct http_msg *msg); __LJMP static int hlua_http_get_headers(lua_State *L, struct http_msg *msg);
@ -886,7 +886,7 @@ static int hlua_smp2lua(lua_State *L, struct sample *smp)
* in Lua strings. This is useful to convert the return of the * in Lua strings. This is useful to convert the return of the
* fetches or converters. * fetches or converters.
*/ */
static int hlua_smp2lua_str(lua_State *L, struct sample *smp) __LJMP static int hlua_smp2lua_str(lua_State *L, struct sample *smp)
{ {
switch (smp->data.type) { switch (smp->data.type) {
@ -4415,7 +4415,7 @@ __LJMP static int hlua_run_sample_fetch(lua_State *L)
/* Convert the returned sample in lua value. */ /* Convert the returned sample in lua value. */
if (hsmp->flags & HLUA_F_AS_STRING) if (hsmp->flags & HLUA_F_AS_STRING)
hlua_smp2lua_str(L, &smp); MAY_LJMP(hlua_smp2lua_str(L, &smp));
else else
hlua_smp2lua(L, &smp); hlua_smp2lua(L, &smp);
@ -4546,7 +4546,7 @@ __LJMP static int hlua_run_sample_conv(lua_State *L)
/* Convert the returned sample in lua value. */ /* Convert the returned sample in lua value. */
if (hsmp->flags & HLUA_F_AS_STRING) if (hsmp->flags & HLUA_F_AS_STRING)
hlua_smp2lua_str(L, &smp); MAY_LJMP(hlua_smp2lua_str(L, &smp));
else else
hlua_smp2lua(L, &smp); hlua_smp2lua(L, &smp);
end: end: