From 6fde4a7d5e4159f47b34bb1ef1487385e4346463 Mon Sep 17 00:00:00 2001
From: Armin Luntzer <armin.luntzer@univie.ac.at>
Date: Wed, 12 Jun 2019 11:54:35 +0000
Subject: [PATCH] server net: do proper cleanup on drop_con_finalize()
---
src/server/net.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/server/net.c b/src/server/net.c
index cd7411b..7d21ccb 100644
--- a/src/server/net.c
+++ b/src/server/net.c
@@ -260,15 +260,11 @@ static void drop_con_finalize(struct con_data *c)
goto unlock;
}
- if (!c->con) {
- g_warning("c->con is NULL");
- goto unlock;
- }
-
-
- if (G_IS_OBJECT(c->con)) {
- g_warning("c->con still holds references");
- goto unlock;
+ if (c->con) {
+ if (G_IS_OBJECT(c->con)) {
+ g_warning("c->con still holds references");
+ goto unlock;
+ }
}
if (!c->nick) {
--
GitLab