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

originate/call forwarding: Fix a crash when forwarding a call from originate

Browse Source 
(closes issue ASTERISK-22487)
Reported by: David M. Lee
Review: https://reviewboard.asterisk.org/r/2868/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@399553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2013-09-20 22:04:25 +00:00
parent 8c10a73830
commit cebe08bf53
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/dial.c
View File

@@ -398,6 +398,15 @@ static int handle_call_forward(struct ast_dial *dial, struct ast_dial_channel *c
*stuff++ = '\0'; *stuff++ = '\0';
tech = tmp; tech = tmp;
device = stuff; device = stuff;
} else {
const char *forward_context;
char destination[AST_MAX_CONTEXT + AST_MAX_EXTENSION + 1];
ast_channel_lock(original);
forward_context = pbx_builtin_getvar_helper(original, "FORWARD_CONTEXT");
snprintf(destination, sizeof(destination), "%s@%s", tmp, S_OR(forward_context, ast_channel_context(original)));
ast_channel_unlock(original);
device = ast_strdupa(destination);
} }
/* Drop old destination information */ /* Drop old destination information */
@@ -409,11 +418,13 @@ static int handle_call_forward(struct ast_dial *dial, struct ast_dial_channel *c
channel->device = ast_strdup(device); channel->device = ast_strdup(device);
AST_LIST_UNLOCK(&dial->channels); AST_LIST_UNLOCK(&dial->channels);
/* Finally give it a go... send it out into the world */
begin_dial_channel(channel, chan, chan ? 0 : 1);
/* Drop the original channel */ /* Drop the original channel */
ast_hangup(original); ast_hangup(original);
channel->owner = NULL;
/* Finally give it a go... send it out into the world */
begin_dial_channel(channel, chan, chan ? 0 : 1);
return 0; return 0;
} }