kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-28 15:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 63099 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63099 | qwell | 2007-05-04 15:03:49 -0500 (Fri, 04 May 2007) | 4 lines

Fix a crash when checking version attribute in an incoming XML caps element.

Issue 9667, patch by phsultan.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-05-04 20:06:02 +00:00
parent 6606166454
commit cddb061140
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_jabber.c
View File

@@ -160,7 +160,7 @@ static char *ajistatus_descrip =
struct aji_client_container clients; struct aji_client_container clients;
struct aji_capabilities *capabilities; struct aji_capabilities *capabilities = NULL;
/*! \brief Global flags, initialized to default values */ /*! \brief Global flags, initialized to default values */
static struct ast_flags globalflags = { AJI_AUTOPRUNE | AJI_AUTOREGISTER }; static struct ast_flags globalflags = { AJI_AUTOPRUNE | AJI_AUTOREGISTER };
@@ -207,6 +207,15 @@ static void aji_buddy_destroy(struct aji_buddy *obj)
free(obj); free(obj);
} }
/*!
* \brief Find version in XML stream and populate our capabilities list
* \param node the node attribute in the caps element we'll look for or add to
* our list
* \param version the version attribute in the caps element we'll look for or
* add to our list
* \param pak the XML stanza we're processing
* \return a pointer to the added or found aji_version structure
*/
static struct aji_version *aji_find_version(char *node, char *version, ikspak *pak) static struct aji_version *aji_find_version(char *node, char *version, ikspak *pak)
{ {
struct aji_capabilities *list = NULL; struct aji_capabilities *list = NULL;
@@ -226,6 +235,8 @@ static struct aji_version *aji_find_version(char *node, char *version, ikspak *p
return res; return res;
res = res->next; res = res->next;
} }
/* Specified version not found. Let's add it to
this node in our capabilities list */
if(!res) { if(!res) {
res = (struct aji_version *)malloc(sizeof(struct aji_version)); res = (struct aji_version *)malloc(sizeof(struct aji_version));
if(!res) { if(!res) {
@@ -242,6 +253,7 @@ static struct aji_version *aji_find_version(char *node, char *version, ikspak *p
} }
list = list->next; list = list->next;
} }
/* Specified node not found. Let's add it our capabilities list */
if(!list) { if(!list) {
list = (struct aji_capabilities *)malloc(sizeof(struct aji_capabilities)); list = (struct aji_capabilities *)malloc(sizeof(struct aji_capabilities));
if(!list) { if(!list) {
@@ -257,7 +269,7 @@ static struct aji_version *aji_find_version(char *node, char *version, ikspak *p
ast_copy_string(res->version, version, sizeof(res->version)); ast_copy_string(res->version, version, sizeof(res->version));
res->jingle = 0; res->jingle = 0;
res->parent = list; res->parent = list;
res->next = list->versions; res->next = NULL;
list->versions = res; list->versions = res;
list->next = capabilities; list->next = capabilities;
capabilities = list; capabilities = list;