diff options
| author | Russell Bryant <russell@russellbryant.com> | 2005-10-19 18:19:02 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2005-10-19 18:19:02 +0000 |
| commit | 4aa7912057e83f052e94637f0b1a10026fe14558 (patch) | |
| tree | 5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_read.c | |
| parent | e5afdbbe160b3267df769c9f04c04c6f152b1c94 (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: https://origsvn.digium.com/svn/asterisk/trunk@6832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_read.c')
| -rwxr-xr-x | apps/app_read.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/apps/app_read.c b/apps/app_read.c index 4fd640112..79b075b28 100755 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -89,11 +89,23 @@ static int read_exec(struct ast_channel *chan, void *data) char *argcopy = NULL; char *args[8]; - if (data) - argcopy = ast_strdupa((char *)data); + if (!data || ast_strlen_zero(data)) { + ast_log(LOG_WARNING, "Read requires an argument (variable)\n"); + return -1; + } + + LOCAL_USER_ADD(u); + + argcopy = ast_strdupa(data); + if (!argcopy) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } if (ast_separate_app_args(argcopy, '|', args, sizeof(args) / sizeof(args[0])) < 1) { - ast_log(LOG_WARNING, "Cannot Parse Arguements.\n"); + ast_log(LOG_WARNING, "Cannot Parse Arguments.\n"); + LOCAL_USER_REMOVE(u); return -1; } @@ -142,9 +154,10 @@ static int read_exec(struct ast_channel *chan, void *data) } if (!(varname) || ast_strlen_zero(varname)) { ast_log(LOG_WARNING, "Invalid! Usage: Read(variable[|filename][|maxdigits][|option][|attempts][|timeout])\n\n"); + LOCAL_USER_REMOVE(u); return -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 */ |