diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
commit | 58818426d60d583c4becc6a99b398cbac1b7b12f (patch) | |
tree | 5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_mp3.c | |
parent | a4d6ea67a7536e2cb2337527357ce6d3db8639f3 (diff) |
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
Diffstat (limited to 'apps/app_mp3.c')
-rwxr-xr-x | apps/app_mp3.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/apps/app_mp3.c b/apps/app_mp3.c index 63f6546b7..eb1889d0b 100755 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -127,21 +127,27 @@ static int mp3_exec(struct ast_channel *chan, void *data) char offset[AST_FRIENDLY_OFFSET]; short frdata[160]; } myf; - if (!data) { + + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "MP3 Playback requires an argument (filename)\n"); return -1; } + + LOCAL_USER_ADD(u); + if (pipe(fds)) { ast_log(LOG_WARNING, "Unable to create pipe\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; } @@ -208,11 +214,14 @@ static int mp3_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; } |