[svn-commits] branch oej/managerstuff r19970 - in /team/oej/managerstuff: ./ apps/

[svn-commits at lists.digium.com]

Author: oej
Date: Fri Apr 14 02:54:09 2006
New Revision: 19970

URL: http://svn.digium.com/view/asterisk?rev=19970&view=rev
Log:
Reset, resolve, go to Tokyo

Modified:
    team/oej/managerstuff/   (props changed)
    team/oej/managerstuff/apps/app_page.c
    team/oej/managerstuff/apps/app_voicemail.c

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 14 02:54:09 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-19421
+/branches/1.2:1-7496,7498-19969

Modified: team/oej/managerstuff/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_page.c?rev=19970&r1=19969&r2=19970&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_page.c (original)
+++ team/oej/managerstuff/apps/app_page.c Fri Apr 14 02:54:09 2006
@@ -173,15 +173,15 @@
 		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 */

Modified: team/oej/managerstuff/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/apps/app_voicemail.c?rev=19970&r1=19969&r2=19970&view=diff
==============================================================================
--- team/oej/managerstuff/apps/app_voicemail.c (original)
+++ team/oej/managerstuff/apps/app_voicemail.c Fri Apr 14 02:54:09 2006
@@ -5519,7 +5519,7 @@
 {
 	int res = 0;
 	struct localuser *u;
-	char tmp[256];
+	char *tmp;
 	struct leave_vm_options leave_options;
 	struct ast_flags flags = { 0 };
 	char *opts[OPT_ARG_ARRAY_SIZE];
@@ -5536,7 +5536,12 @@
 		ast_answer(chan);
 
 	if (!ast_strlen_zero(data)) {
-		ast_copy_string(tmp, data, sizeof(tmp));
+		tmp = ast_strdupa((char *)data);
+		if (!tmp) {
+			ast_log(LOG_ERROR, "Out of memory\n");
+			LOCAL_USER_REMOVE(u);
+			return -1;
+		}
 		AST_STANDARD_APP_ARGS(args, tmp);
 		if (args.argc == 2) {
 			if (ast_app_parse_options(vm_app_options, &flags, opts, args.argv1)) {
@@ -5572,6 +5577,7 @@
 			}
 		}
 	} else {
+		char tmp[256];
 		res = ast_app_getdata(chan, "vm-whichbox", tmp, sizeof(tmp) - 1, 0);
 		if (res < 0) {
 			LOCAL_USER_REMOVE(u);