Merged revisions 72125 via svnmerge from

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

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index abd6d9d..18686e1 100644 (file)
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -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
         * generate a needless NewCallerID event */
        if (!strcasecmp(client->name, "guest")) {
-               if (strchr(i->them, '/')) {
-                       char *aux;
-                       data = ast_strdupa((char *)i->them);
-                       aux = data;
-                       cid = strsep(&aux, "/");
+               data = ast_strdupa(i->them);
+               if (strchr(data, '/')) {
+                       cid = strsep(&data, "/");
                } else
-                       cid = i->them;
+                       cid = data;
        } else {
-               cid = client->user;
+               data =  ast_strdupa(client->user);
+               cid = data;
        }
        cid = strsep(&cid, "@");
        tmp->cid.cid_num = ast_strdup(cid);