diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-03-16 18:09:52 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-03-16 18:09:52 +0000 |
| commit | 1192b3d84b5578e2231ec7fdba2a8d4cc794d9ea (patch) | |
| tree | 49236669bf6217e03dbdb1f7575e1c0d092a26fd /src | |
| parent | c4c761b5ad5d90556f5c67940e311b31ce93b363 (diff) | |
| download | rspamd-1192b3d84b5578e2231ec7fdba2a8d4cc794d9ea.tar.gz rspamd-1192b3d84b5578e2231ec7fdba2a8d4cc794d9ea.zip | |
[Fix] Fix double free when closing lua_tcp connections
Diffstat (limited to 'src')
| -rw-r--r-- | src/lua/lua_tcp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lua/lua_tcp.c b/src/lua/lua_tcp.c index 60a29c990..21a357400 100644 --- a/src/lua/lua_tcp.c +++ b/src/lua/lua_tcp.c @@ -185,6 +185,7 @@ struct lua_tcp_dtor { #define LUA_TCP_FLAG_PARTIAL (1 << 0) #define LUA_TCP_FLAG_SHUTDOWN (1 << 2) #define LUA_TCP_FLAG_CONNECTED (1 << 3) +#define LUA_TCP_FLAG_FINISHED (1 << 4) struct lua_tcp_cbdata { lua_State *L; @@ -725,9 +726,12 @@ lua_tcp_plan_handler_event (struct lua_tcp_cbdata *cbd, gboolean can_read, hdl = g_queue_peek_head (cbd->handlers); if (hdl == NULL) { - /* We are finished with a connection */ - msg_debug_tcp ("no handlers left, finish session"); - REF_RELEASE (cbd); + if (!(cbd->flags & LUA_TCP_FLAG_FINISHED)) { + /* We are finished with a connection */ + msg_debug_tcp ("no handlers left, finish session"); + REF_RELEASE (cbd); + cbd->flags |= LUA_TCP_FLAG_FINISHED; + } } else { if (hdl->type == LUA_WANT_READ) { @@ -1225,6 +1229,7 @@ lua_tcp_close (lua_State *L) return luaL_error (L, "invalid arguments"); } + cbd->flags |= LUA_TCP_FLAG_FINISHED; REF_RELEASE (cbd); return 0; |