summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2006-06-18 21:24:35 +0000
committerRussell Bryant <russell@russellbryant.com>2006-06-18 21:24:35 +0000
commitf75ad9736a8e2135bfdb10f36c1ef58667797241 (patch)
tree03653b3d5b48a70c03f0ab06eb893ef40c513256
parenta7863b434546a4718a8480243a470d482ed10e58 (diff)
bail if ast_calloc fails, this was done before but i accidently removed it when
moving these allocations so duplicate error messages were not produced (issue #7345) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_jingle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index a5c649ec7..16bd521da 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -536,6 +536,8 @@ static int jingle_create_candidates(struct jingle *client, struct jingle_pvt *p,
}
ours1 = ast_calloc(1, sizeof(*ours1));
ours2 = ast_calloc(1, sizeof(*ours2));
+ if (!ours1 || !ours2)
+ goto safeout;
iks_insert_node(iq, jingle);
iks_insert_node(jingle, candidate);