From 58818426d60d583c4becc6a99b398cbac1b7b12f Mon Sep 17 00:00:00 2001 From: russell 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: http://svn.digium.com/svn/asterisk/trunk@6832 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_playback.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'apps/app_playback.c') diff --git a/apps/app_playback.c b/apps/app_playback.c index 66f4fd05f..62f647eb0 100755 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -69,10 +69,21 @@ static int playback_exec(struct ast_channel *chan, void *data) int option_noanswer = 0; char *stringp = NULL; char *front = NULL, *back = NULL; - if (!data || ast_strlen_zero((char *)data) || !(tmp = ast_strdupa(data))) { + + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Playback requires an argument (filename)\n"); return -1; } + + LOCAL_USER_ADD(u); + + tmp = ast_strdupa(data); + if (!tmp) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } + stringp = tmp; strsep(&stringp, "|"); options = strsep(&stringp, "|"); @@ -80,7 +91,7 @@ static int playback_exec(struct ast_channel *chan, void *data) option_skip = 1; if (options && !strcasecmp(options, "noanswer")) option_noanswer = 1; - LOCAL_USER_ADD(u); + if (chan->_state != AST_STATE_UP) { if (option_skip) { /* At the user's option, skip if the line is not up */ -- cgit v1.2.3