From 4aa7912057e83f052e94637f0b1a10026fe14558 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 19 Oct 2005 18:19:02 +0000 Subject: 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: https://origsvn.digium.com/svn/asterisk/trunk@6832 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_page.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'apps/app_page.c') diff --git a/apps/app_page.c b/apps/app_page.c index 6f6463e20..2e3d0e1e5 100755 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -120,25 +120,25 @@ static int page_exec(struct ast_channel *chan, void *data) char *tmp; int res=0; - if (!data) - return -1; - - if (ast_strlen_zero(data)) { + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "This application requires at least one argument (destination(s) to page)\n"); return -1; } + LOCAL_USER_ADD(u); + if (!(app = pbx_findapp("MeetMe"))) { ast_log(LOG_WARNING, "There is no MeetMe application available!\n"); + LOCAL_USER_REMOVE(u); return -1; }; - if (!(options = ast_strdupa((char *) data))) { + options = ast_strdupa(data); + if (!options) { ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); return -1; } - - LOCAL_USER_ADD(u); tmp = strsep(&options, "|"); if (options) -- cgit v1.2.3