diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2022-10-05 23:12:04 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rspamd.com> | 2022-10-05 23:15:54 +0100 |
| commit | cdbacf2b135fc49a84df1d0790c2ba77d6d763b7 (patch) | |
| tree | dbd6d4f8845df09c3121cf3bd609e032f16c8f44 | |
| parent | affca08d98c1e65bee32d1ab5143defade24e72b (diff) | |
| download | rspamd-cdbacf2b135fc49a84df1d0790c2ba77d6d763b7.tar.gz rspamd-cdbacf2b135fc49a84df1d0790c2ba77d6d763b7.zip | |
[Fix] Fix hang when close is used
| -rw-r--r-- | src/lua/lua_tcp.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/lua/lua_tcp.c b/src/lua/lua_tcp.c index 05c9de7a2..643978a49 100644 --- a/src/lua/lua_tcp.c +++ b/src/lua/lua_tcp.c @@ -602,6 +602,12 @@ lua_tcp_push_error (struct lua_tcp_cbdata *cbd, gboolean is_fatal, TCP_RELEASE (cbd); + if ((cbd->flags & (LUA_TCP_FLAG_FINISHED|LUA_TCP_FLAG_CONNECTED)) == + (LUA_TCP_FLAG_FINISHED|LUA_TCP_FLAG_CONNECTED)) { + /* A callback has called `close` method, so we need to release a refcount */ + TCP_RELEASE (cbd); + } + callback_called = TRUE; } @@ -694,6 +700,12 @@ lua_tcp_push_data (struct lua_tcp_cbdata *cbd, const guint8 *str, gsize len) lua_settop (L, top); TCP_RELEASE (cbd); + + if ((cbd->flags & (LUA_TCP_FLAG_FINISHED|LUA_TCP_FLAG_CONNECTED)) == + (LUA_TCP_FLAG_FINISHED|LUA_TCP_FLAG_CONNECTED)) { + /* A callback has called `close` method, so we need to release a refcount */ + TCP_RELEASE (cbd); + } } lua_thread_pool_restore_callback (&cbs); @@ -1134,6 +1146,12 @@ lua_tcp_handler (int fd, short what, gpointer ud) lua_settop (L, top); TCP_RELEASE (cbd); lua_thread_pool_restore_callback (&cbs); + + if ((cbd->flags & (LUA_TCP_FLAG_FINISHED|LUA_TCP_FLAG_CONNECTED)) == + (LUA_TCP_FLAG_FINISHED|LUA_TCP_FLAG_CONNECTED)) { + /* A callback has called `close` method, so we need to release a refcount */ + TCP_RELEASE (cbd); + } } } } |