kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

better fix for the previous bug.

Browse Source 
In general this code needs a deep revision, because the body of
do_forward() deletes/overwrites the output channel without freeing
the resouce in some cases, and without notifying the caller.

Also, on FreeBSD with MALLOC_OPTIONS set i am seeing various panics
(duplicate freee etc.)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47881 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-11-21 11:53:06 +00:00
parent 64a9c28c3b
commit bbba4e5a20
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_dial.c
View File

@@ -419,7 +419,12 @@ static void senddialendevent(const struct ast_channel *src, const char *dialstat
src->name, dialstatus); src->name, dialstatus);
} }
/* helper function for wait_for_answer() */ /*!
* helper function for wait_for_answer()
*
* XXX this code is highly suspicious, as it essentially overwrites
* the outgoing channel without properly deleting it.
*/
static void do_forward(struct dial_localuser *o, static void do_forward(struct dial_localuser *o,
struct cause_args *num, struct ast_flags *peerflags, int single) struct cause_args *num, struct ast_flags *peerflags, int single)
{ {
@@ -504,9 +509,9 @@ static void do_forward(struct dial_localuser *o,
char cidname[AST_MAX_EXTENSION]; char cidname[AST_MAX_EXTENSION];
ast_set_callerid(c, S_OR(in->macroexten, in->exten), get_cid_name(cidname, sizeof(cidname), in), NULL); ast_set_callerid(c, S_OR(in->macroexten, in->exten), get_cid_name(cidname, sizeof(cidname), in), NULL);
} }
/* Hangup the original channel now, in case we needed it */
ast_hangup(c);
} }
/* Hangup the original channel now, in case we needed it */
ast_hangup(c);
} }
} }