From 835c77ccfa56815b51fc3daded4f7fd39f5e5cca Mon Sep 17 00:00:00 2001
From: Matt O'Gorman <mogorman@digium.com>
Date: Tue, 6 Jun 2006 19:18:44 +0000
Subject: [PATCH] fix a potential segfault
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
res/res_jabber.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 6b516d410b..8a16ade885 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -811,7 +811,11 @@ static int aji_client_info_handler(void *data, ikspak *pak)
buddy = ASTOBJ_CONTAINER_FIND(&client->buddies, pak->from->partial);
resource = aji_find_resource(buddy, pak->from->resource);
-
+ if (!resource) {
+ ast_log(LOG_NOTICE,"JABBER: Received client info from %s when not requested.\n", pak->from->full);
+ ASTOBJ_UNREF(client, aji_client_destroy);
+ return IKS_FILTER_EAT;
+ }
if (pak->subtype == IKS_TYPE_RESULT) {
if (iks_find_with_attrib(pak->query, "feature", "var", "http://www.google.com/xmpp/protocol/voice/v1")) {
resource->cap->jingle = 1;
@@ -837,8 +841,8 @@ static int aji_client_info_handler(void *data, ikspak *pak)
iks_insert_attrib(google, "var", "http://www.google.com/xmpp/protocol/voice/v1");
iks_insert_node(iq, query);
iks_insert_node(query, ident);
- iks_insert_node(query, disco);
iks_insert_node(query, google);
+ iks_insert_node(query, disco);
iks_send(client->p, iq);
} else
ast_log(LOG_ERROR, "Out of Memory.\n");
--
GitLab