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, 10 insertions, 2 deletions

diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 515806941..150744bcc 100755
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -117,17 +117,22 @@ static int NBScat_exec(struct ast_channel *chan, void *data)
 		char offset[AST_FRIENDLY_OFFSET];
 		short frdata[160];
 	} myf;
+	
+	LOCAL_USER_ADD(u);
+
 	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, fds)) {
 		ast_log(LOG_WARNING, "Unable to create socketpair\n");
+		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
-	LOCAL_USER_ADD(u);
+	
 	ast_stopstream(chan);
 
 	owriteformat = chan->writeformat;
 	res = ast_set_write_format(chan, AST_FORMAT_SLINEAR);
 	if (res < 0) {
 		ast_log(LOG_WARNING, "Unable to set write format to signed linear\n");
+		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
 	
@@ -191,11 +196,14 @@ static int NBScat_exec(struct ast_channel *chan, void *data)
 	}
 	close(fds[0]);
 	close(fds[1]);
-	LOCAL_USER_REMOVE(u);
+	
 	if (pid > -1)
 		kill(pid, SIGKILL);
 	if (!res && owriteformat)
 		ast_set_write_format(chan, owriteformat);
+
+	LOCAL_USER_REMOVE(u);
+
 	return res;
 }