Massive cleanups to applications for LOCAL_USER handling and some other things.

In general, LOCAL_USER_ADD/REMOVE should be the first/last thing called in an
application.  An exception is if there is some *fast* setup code that might
halt the execution of the application, such as checking to see if an argument
exists.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6832 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 9 insertions, 11 deletions

diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index e5af548ff..06daddcdf 100755
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -256,6 +256,12 @@ static int app_exec(struct ast_channel *chan, void *data)
 	FILE *child_errors = NULL;
 	FILE *child_events = NULL;
 
+	LOCAL_USER_ADD(u);
+	
+	AST_LIST_HEAD_INIT(&u->playlist);
+	AST_LIST_HEAD_INIT(&u->finishlist);
+	u->abort_current_sound = 0;
+	
 	if (!args || ast_strlen_zero(args)) {
 		ast_log(LOG_WARNING, "ExternalIVR requires a command to execute\n");
 		goto exit;
@@ -268,8 +274,6 @@ static int app_exec(struct ast_channel *chan, void *data)
 	while ((argc < 31) && (argv[argc++] = strsep(&buf, "|")));
 	argv[argc] = NULL;
 
-	LOCAL_USER_ADD(u);
-
 	if (pipe(child_stdin)) {
 		ast_chan_log(LOG_WARNING, chan, "Could not create pipe for child input: %s\n", strerror(errno));
 		goto exit;
@@ -285,10 +289,6 @@ static int app_exec(struct ast_channel *chan, void *data)
 		goto exit;
 	}
 
-	u->abort_current_sound = 0;
-	AST_LIST_HEAD_INIT(&u->playlist);
-	AST_LIST_HEAD_INIT(&u->finishlist);
-
 	if (chan->_state != AST_STATE_UP) {
 		ast_answer(chan);
 	}
@@ -533,12 +533,10 @@ static int app_exec(struct ast_channel *chan, void *data)
 	if (child_stderr[1])
 		close(child_stderr[1]);
 
-	if (u) {
-		while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list)))
-			free(entry);
+	while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list)))
+		free(entry);
 
-		LOCAL_USER_REMOVE(u);
-	}
+	LOCAL_USER_REMOVE(u);
 
 	return res;
 }