diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-05 20:23:33 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-05 20:23:33 +0000 |
| commit | b457523ef34e5b223cbabd90ac61957088858ca1 (patch) | |
| tree | de87402e2d8e458a42d3c0253ae647832b881fe7 | |
| parent | b79a4f7abb7cce6e891ad7118cb42611b1cddeb4 (diff) | |
Merged revisions 290396 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r290396 | tilghman | 2010-10-05 15:21:02 -0500 (Tue, 05 Oct 2010) | 15 lines
Merged revisions 290392 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r290392 | tilghman | 2010-10-05 15:20:07 -0500 (Tue, 05 Oct 2010) | 8 lines
Fix a crash by ensuring that we don't alter memory after it's freed.
(closes issue #17387)
Reported by: jmls
Patches:
20100726__issue17387.diff.txt uploaded by tilghman (license 14)
Tested by: jmls
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@290408 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | res/res_jabber.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index 9548dd800..ccf9d3d30 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -3038,20 +3038,23 @@ static int aji_get_roster(struct aji_client *client) static int aji_client_connect(void *data, ikspak *pak) { struct aji_client *client = ASTOBJ_REF((struct aji_client *) data); - int res = 0; + int res = IKS_FILTER_PASS; if (client) { if (client->state == AJI_DISCONNECTED) { iks_filter_add_rule(client->f, aji_filter_roster, client, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_SUBTYPE, IKS_TYPE_RESULT, IKS_RULE_ID, "roster", IKS_RULE_DONE); client->state = AJI_CONNECTING; client->jid = (iks_find_cdata(pak->query, "jid")) ? iks_id_new(client->stack, iks_find_cdata(pak->query, "jid")) : client->jid; - iks_filter_remove_hook(client->f, aji_client_connect); if (!client->component) { /*client*/ aji_get_roster(client); - if (client->distribute_events) { - aji_init_event_distribution(client); - } } + if (client->distribute_events) { + aji_init_event_distribution(client); + } + + iks_filter_remove_hook(client->f, aji_client_connect); + /* Once we remove the hook for this routine, we must return EAT or we will crash or corrupt memory */ + res = IKS_FILTER_EAT; } } else { ast_log(LOG_ERROR, "Out of memory.\n"); |