mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 20:56:39 +00:00
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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user