diff options
author | Jason Parker <jparker@digium.com> | 2007-10-31 21:18:52 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2007-10-31 21:18:52 +0000 |
commit | fa33494d802bb7f992e80da997ced8f774f3b14d (patch) | |
tree | bb5826c9874524d587e571d80ca360c630a56e95 /channels/chan_gtalk.c | |
parent | 59c9ff7ef2c001e68d1a75af3e9f6b4c24a6196e (diff) |
Merged revisions 87906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #11130)
(closes issue #11132)
........
r87906 | qwell | 2007-10-31 16:16:20 -0500 (Wed, 31 Oct 2007) | 4 lines
Don't try to allocate memory that we're just going to re-allocate later anyways.
Issues 11130 and 11132, patch by eliel.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_gtalk.c')
-rw-r--r-- | channels/chan_gtalk.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index f1790230f..0bef78eae 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -1215,9 +1215,6 @@ static int gtalk_add_candidate(struct gtalk *client, ikspak *pak) if(!from) from = c->jid->full; - newcandidate = ast_calloc(1, sizeof(*newcandidate)); - if (!newcandidate) - return 0; for (tmp = client->p; tmp; tmp = tmp->next) { if (iks_find_with_attrib(pak->x, "session", "id", tmp->sid)) { p = tmp; |