From: Matt O'Gorman Date: Thu, 12 Oct 2006 20:41:37 +0000 (+0000) Subject: Merged revisions 44982 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~4429 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e20bb6fa694ee7b8b1302c8cdb5839384b7317b9;p=thirdparty%2Fasterisk.git Merged revisions 44982 via svnmerge from https://svn.digium.com/svn/asterisk/branches/1.4 ........ r44982 | mogorman | 2006-10-12 15:34:49 -0500 (Thu, 12 Oct 2006) | 2 lines fix for bug 7764. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44983 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index fa8b57e4e7..23feebc57b 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -879,10 +879,11 @@ static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const if(strchr(tmp->us, '/')) { data = ast_strdupa((char *) tmp->us); exten = strsep(&data, "/"); - free(data); } else exten = tmp->us; ast_copy_string(tmp->exten, exten, sizeof(tmp->exten)); + if(data) + free(data); ast_mutex_init(&tmp->lock); ast_mutex_lock(>alklock); tmp->next = client->p;