diff options
author | Jason Parker <jparker@digium.com> | 2007-02-20 16:56:58 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2007-02-20 16:56:58 +0000 |
commit | ae47fc4541585d169d8bf6655211650c41470d45 (patch) | |
tree | d8ce6d1225cae1aecb478b803bc364dfff1cd095 /channels/chan_jingle.c | |
parent | 006817c0e7f1431d5f9316882ab3cf6226be670a (diff) |
Merged revisions 55555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r55555 | qwell | 2007-02-20 10:53:45 -0600 (Tue, 20 Feb 2007) | 4 lines
No need to cast nor free with strdupa (thanks file)
55555!
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_jingle.c')
-rw-r--r-- | channels/chan_jingle.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index b41e49bb5..26980640b 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -1360,15 +1360,13 @@ static struct ast_channel *jingle_request(const char *type, int format, void *da struct ast_channel *chan = NULL; if (data) { - s = ast_strdupa((char *) data); + s = ast_strdupa(data); if (s) { sender = strsep(&s, "/"); if (sender && (sender[0] != '\0')) to = strsep(&s, "/"); if (!to) { ast_log(LOG_ERROR, "Bad arguments in Jingle Dialstring: %s\n", (char*) data); - if (s) - free(s); return NULL; } } @@ -1376,8 +1374,6 @@ static struct ast_channel *jingle_request(const char *type, int format, void *da client = find_jingle(to, sender); if (!client) { ast_log(LOG_WARNING, "Could not find recipient.\n"); - if (s) - free(s); return NULL; } p = jingle_alloc(client, to, NULL); |