1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
|
From ff113220df9073c3e6078487e87b6a7b86e2d952 Mon Sep 17 00:00:00 2001
From: Mikael Hallendal <micke@imendio.com>
Date: Sun, 30 Nov 2008 09:27:21 +0100
Subject: [PATCH] Don't free connection internals before it's closed. [#34]
When the connection freed up internal states (in this case the handler
lists) before closing itself it segfaulted when trying to unregister the
SASL handlers.
Reported by Julien Puydt.
---
loudmouth/lm-connection.c | 30 +++++++++++++++++-------------
loudmouth/lm-sasl.c | 18 +++++++++---------
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
index 915c0ad..dda2978 100644
--- a/loudmouth/lm-connection.c
+++ b/loudmouth/lm-connection.c
@@ -191,13 +191,21 @@ connection_free (LmConnection *connection)
{
int i;
+ /* This needs to be run before starting to free internal states.
+ * It used to be run after the handlers where freed which lead to a crash
+ * when the connection was freed prior to running lm_connection_close.
+ */
+ if (connection->state >= LM_CONNECTION_STATE_OPENING) {
+ connection_do_close (connection);
+ }
+
g_free (connection->server);
g_free (connection->jid);
g_free (connection->effective_jid);
g_free (connection->stream_id);
g_free (connection->resource);
- if (connection->sasl) {
+ if (connection->sasl) {
lm_sasl_free (connection->sasl);
}
@@ -218,13 +226,9 @@ connection_free (LmConnection *connection)
g_slist_free (connection->handlers[i]);
}
-
g_hash_table_destroy (connection->id_handlers);
- if (connection->state >= LM_CONNECTION_STATE_OPENING) {
- connection_do_close (connection);
- }
- if (connection->open_cb) {
+ if (connection->open_cb) {
_lm_utils_free_callback (connection->open_cb);
}
@@ -2030,11 +2034,11 @@ lm_connection_unregister_message_handler (LmConnection *connection,
g_return_if_fail (handler != NULL);
g_return_if_fail (type != LM_MESSAGE_TYPE_UNKNOWN);
- for (l = connection->handlers[type]; l; l = l->next) {
- HandlerData *hd = (HandlerData *) l->data;
-
+ for (l = connection->handlers[type]; l; l = l->next) {
+ HandlerData *hd = (HandlerData *) l->data;
+
if (handler == hd->handler) {
- connection->handlers[type] = g_slist_remove_link (connection->handlers[type], l);
+ connection->handlers[type] = g_slist_remove_link (connection->handlers[type], l);
g_slist_free (l);
lm_message_handler_unref (hd->handler);
g_free (hd);
@@ -2140,7 +2144,7 @@ lm_connection_ref (LmConnection *connection)
g_return_val_if_fail (connection != NULL, NULL);
connection->ref_count++;
-
+
return connection;
}
@@ -2157,8 +2161,8 @@ lm_connection_unref (LmConnection *connection)
g_return_if_fail (connection != NULL);
connection->ref_count--;
-
+
if (connection->ref_count == 0) {
- connection_free (connection);
+ connection_free (connection);
}
}
diff --git a/loudmouth/lm-sasl.c b/loudmouth/lm-sasl.c
index 42ee0e1..e6a72f5 100644
--- a/loudmouth/lm-sasl.c
+++ b/loudmouth/lm-sasl.c
@@ -807,27 +807,27 @@ lm_sasl_free (LmSASL *sasl)
g_free (sasl->server);
if (sasl->features_cb) {
- lm_connection_unregister_message_handler (sasl->connection,
- sasl->features_cb,
- LM_MESSAGE_TYPE_STREAM_FEATURES);
+ lm_connection_unregister_message_handler (sasl->connection,
+ sasl->features_cb,
+ LM_MESSAGE_TYPE_STREAM_FEATURES);
}
if (sasl->challenge_cb) {
lm_connection_unregister_message_handler (sasl->connection,
- sasl->challenge_cb,
- LM_MESSAGE_TYPE_CHALLENGE);
+ sasl->challenge_cb,
+ LM_MESSAGE_TYPE_CHALLENGE);
}
if (sasl->success_cb) {
lm_connection_unregister_message_handler (sasl->connection,
- sasl->success_cb,
- LM_MESSAGE_TYPE_SUCCESS);
+ sasl->success_cb,
+ LM_MESSAGE_TYPE_SUCCESS);
}
if (sasl->failure_cb) {
lm_connection_unregister_message_handler (sasl->connection,
- sasl->failure_cb,
- LM_MESSAGE_TYPE_FAILURE);
+ sasl->failure_cb,
+ LM_MESSAGE_TYPE_FAILURE);
}
g_free (sasl);
--
1.7.7.1
|
