From: Kevin P. Fleming <kpfleming@digium.com>
Date: Thu, 13 Apr 2006 17:52:23 +0000 (+0000)
Subject: Merged revisions 19812 via svnmerge from
X-Git-Tag: 1.2.7.1-netsec~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63566eac42c1c8b2b78b72e86956393ab30f081f;p=thirdparty%2Fasterisk.git

Merged revisions 19812 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r19812 | kpfleming | 2006-04-13 12:40:21 -0500 (Thu, 13 Apr 2006) | 2 lines

oops... let's not set a variable and then immediately overwrite it while assuming its old value will magically return

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@19818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_page.c b/apps/app_page.c
index 6898bfa27e..bd050d1839 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -171,16 +171,16 @@ static int page_exec(struct ast_channel *chan, void *data)
 		return -1;
 	}
 
+	ast_copy_string(originator, chan->name, sizeof(originator));
+	if ((tmp = strchr(originator, '-')))
+		*tmp = '\0';
+
 	tmp = strsep(&options, "|");
 	if (options)
 		ast_app_parse_options(page_opts, &flags, NULL, options);
 
 	snprintf(meetmeopts, sizeof(meetmeopts), "%ud|%sqxdw", confid, ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "m");
 
-	ast_copy_string(originator, chan->name, sizeof(originator));
-	if ((tmp = strchr(originator, '-')))
-		*tmp = '\0';
-
 	while ((tech = strsep(&tmp, "&"))) {
 		/* don't call the originating device */
 		if (!strcasecmp(tech, originator))