From: Luigi Rizzo <rizzo@icir.org>
Date: Tue, 21 Nov 2006 11:53:06 +0000 (+0000)
Subject: better fix for the previous bug.
X-Git-Tag: 1.6.0-beta1~3^2~3894
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbba4e5a20ddd83bee7c78957e14da441d7dd645;p=thirdparty%2Fasterisk.git

better fix for the previous bug.

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
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 6c1501b635..2d15fbefc0 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -419,7 +419,12 @@ static void senddialendevent(const struct ast_channel *src, const char *dialstat
 					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,
 	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];
 				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);
 	}
 }