kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 72125 via svnmerge from

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

........
r72125 | qwell | 2007-06-27 12:10:32 -0500 (Wed, 27 Jun 2007) | 4 lines

Don't modify a variable that we don't want modified.  Make a copy of it instead.

Issue 10029, patch by phsultan with slight modifications by me (to remove needless casts).

Note: chan_jingle in trunk does not appear to have the same bug.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72134 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-06-27 17:14:31 +00:00
parent 36b0448bc1
commit 8bf745194f
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
channels/chan_gtalk.c
View File

@@ -969,15 +969,14 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
/* Don't use ast_set_callerid() here because it will /* Don't use ast_set_callerid() here because it will
* generate a needless NewCallerID event */ * generate a needless NewCallerID event */
if (!strcasecmp(client->name, "guest")) { if (!strcasecmp(client->name, "guest")) {
if (strchr(i->them, '/')) { data = ast_strdupa(i->them);
char *aux; if (strchr(data, '/')) {
data = ast_strdupa((char *)i->them); cid = strsep(&data, "/");
aux = data;
cid = strsep(&aux, "/");
} else } else
cid = i->them; cid = data;
} else { } else {
cid = client->user; data = ast_strdupa(client->user);
cid = data;
} }
cid = strsep(&cid, "@"); cid = strsep(&cid, "@");
tmp->cid.cid_num = ast_strdup(cid); tmp->cid.cid_num = ast_strdup(cid);