mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2026-01-19 00:51:37 +01:00
BUG/MEDIUM: httpclient/lua: double LIST_DELETE on end of lua task
The lua httpclient cleanup can be called in 2 places, the hlua_httpclient_gc() and the hlua_httpclient_destroy_all(). A LIST_DELETE() is performed to remove the hlua_hc struct of the list. However, when the lua task ends and call hlua_ctx_destroy(), it does a LIST_DELETE() first, and then the gc tries to do a LIST_DELETE() again in hlua_httpclient_gc(), provoking a crash. This patch fixes the issue by doing a LIST_DEL_INIT() instead of LIST_DELETE() in both cases. Should fix issue #1958. Must be backported where bb58142 is backported.
This commit is contained in:
parent
46676d44e0
commit
94dbfedec1
@ -1279,7 +1279,7 @@ static void hlua_httpclient_destroy_all(struct hlua *hlua)
|
||||
if (hlua_hc->hc)
|
||||
httpclient_stop_and_destroy(hlua_hc->hc);
|
||||
hlua_hc->hc = NULL;
|
||||
LIST_DELETE(&hlua_hc->by_hlua);
|
||||
LIST_DEL_INIT(&hlua_hc->by_hlua);
|
||||
}
|
||||
}
|
||||
|
||||
@ -7033,10 +7033,8 @@ __LJMP static int hlua_httpclient_gc(lua_State *L)
|
||||
if (hlua_hc->hc)
|
||||
httpclient_stop_and_destroy(hlua_hc->hc);
|
||||
|
||||
LIST_DELETE(&hlua_hc->by_hlua);
|
||||
|
||||
hlua_hc->hc = NULL;
|
||||
|
||||
LIST_DEL_INIT(&hlua_hc->by_hlua);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user