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

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index f179023..0bef78e 100644 (file)
--- 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;

diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index fecdff9..37c7e69 100644 (file)
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -1064,9 +1064,7 @@ static int jingle_add_candidate(struct jingle *client, ikspak *pak)
        struct aji_client *c = client->connection;
        struct jingle_candidate *newcandidate = NULL;
        iks *traversenodes = NULL, *receipt = NULL;
-       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, JINGLE_NODE, JINGLE_SID, tmp->sid)) {
                        p = tmp;