upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-12 05:32:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

BUG/MINOR: hlua: fix return with push nil on proxy check
Some checks are pending
Contrib / build (push) Waiting to run
Details
alpine/musl / gcc (push) Waiting to run
Details
VTest / Generate Build Matrix (push) Waiting to run
Details
VTest / (push) Blocked by required conditions
Details
Windows / Windows, gcc, all features (push) Waiting to run
Details

Browse source 
hlua_check_proxy() may now return NULL if the target proxy instance has
been flagged for deletion. Thus, proxies method have been adjusted and
may push nil to report such case.

This patch fixes these error paths. When nil is pushed, 1 must be
returned instead of 0. This represents the count of pushed values on the
stack which can be retrieved by the caller.

No need to backport.
This commit is contained in:
Amaury Denoyelle 2026-03-03 08:45:27 +01:00
parent e07a75c764
commit f41e684e9a
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/hlua_fcn.c
View file

@ -1988,7 +1988,7 @@ int hlua_proxy_get_name(lua_State *L)
px = hlua_check_proxy(L, 1);
if (px == NULL) {
lua_pushnil(L);
return 0;
return 1;
}
lua_pushstring(L, px->id);
@ -2003,7 +2003,7 @@ int hlua_proxy_get_uuid(lua_State *L)
px = hlua_check_proxy(L, 1);
if (px == NULL) {
lua_pushnil(L);
return 0;
return 1;
}
snprintf(buffer, sizeof(buffer), "%d", px->uuid);
@ -2086,7 +2086,7 @@ int hlua_proxy_get_cap(lua_State *L)
px = hlua_check_proxy(L, 1);
if (px == NULL) {
lua_pushnil(L);
return 0;
return 1;
}
str = proxy_cap_str(px->cap);
@ -2102,7 +2102,7 @@ int hlua_proxy_get_stats(lua_State *L)
px = hlua_check_proxy(L, 1);
if (px == NULL) {
lua_pushnil(L);
return 0;
return 1;
}
if (px->cap & PR_CAP_BE)
@ -2127,7 +2127,7 @@ int hlua_proxy_get_mode(lua_State *L)
px = hlua_check_proxy(L, 1);
if (px == NULL) {
lua_pushnil(L);
return 0;
return 1;
}
str = proxy_mode_str(px->mode);
@ -2154,7 +2154,7 @@ int hlua_proxy_get_srv_act(lua_State *L)
px = hlua_check_proxy(L, 1);
if (px == NULL) {
lua_pushnil(L);
return 0;
return 1;
}
lua_pushinteger(L, px->srv_act);
@ -2168,7 +2168,7 @@ int hlua_proxy_get_srv_bck(lua_State *L)
px = hlua_check_proxy(L, 1);
if (px == NULL) {
lua_pushnil(L);
return 0;
return 1;
}
lua_pushinteger(L, px->srv_bck);
@ -2187,7 +2187,7 @@ int hlua_proxy_get_mailers(lua_State *L)
px = hlua_check_proxy(L, 1);
if (px == NULL) {
lua_pushnil(L);
return 0;
return 1;
}
if (!px->email_alert.mailers.m)