From: Mark Spencer <markster@digium.com>
Date: Mon, 21 Jun 2004 13:30:58 +0000 (+0000)
Subject: Fix app_dial buglet
X-Git-Tag: 1.0.0-rc1~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=502e74e5dbe3be4082aef2ff0bbd4148582124d1;p=thirdparty%2Fasterisk.git

Fix app_dial buglet


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index eca00317ca..cb794c5904 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -410,8 +410,8 @@ static int dial_exec(struct ast_channel *chan, void *data)
 	char info[256], *peers, *timeout, *tech, *number, *rest, *cur;
 	char  privdb[256] = "", *s;
 	char  announcemsg[256] = "", *ann;
-	struct localuser *outgoing=NULL, *tmp,*o=NULL;
-	struct ast_channel *peer,*in=NULL;
+	struct localuser *outgoing=NULL, *tmp;
+	struct ast_channel *peer;
 	int to;
 	int allowredir_in=0;
 	int allowredir_out=0;
@@ -713,7 +713,7 @@ static int dial_exec(struct ast_channel *chan, void *data)
 			char tmpchan[256]="";
 			char *stuff;
 			char *tech;
-			strncpy(tmpchan, o->chan->call_forward, sizeof(tmpchan) - 1);
+			strncpy(tmpchan, tmp->chan->call_forward, sizeof(tmpchan) - 1);
 			if ((stuff = strchr(tmpchan, '/'))) {
 				*stuff = '\0';
 				stuff++;
@@ -725,10 +725,10 @@ static int dial_exec(struct ast_channel *chan, void *data)
 			}
 			/* Before processing channel, go ahead and check for forwarding */
 			if (option_verbose > 2)
-				ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' (thanks to %s)\n", in->name, tech, stuff, tmp->chan->name);
+				ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' (thanks to %s)\n", chan->name, tech, stuff, tmp->chan->name);
 			/* Setup parameters */
-			ast_hangup(o->chan);
-			tmp->chan = ast_request(tech, in->nativeformats, stuff);
+			ast_hangup(tmp->chan);
+			tmp->chan = ast_request(tech, chan->nativeformats, stuff);
 			if (!tmp->chan) {
 				ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s'\n", tech, stuff);
 				free(tmp);