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_readfile.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_readfile.c')
| -rwxr-xr-x | apps/app_readfile.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/app_readfile.c b/apps/app_readfile.c index 537786f04..d08041f4e 100755 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -63,10 +63,17 @@ static int readfile_exec(struct ast_channel *chan, void *data) char *s, *varname=NULL, *file=NULL, *length=NULL, *returnvar=NULL; int len=0; + if (!data || ast_strlen_zero(data)) { + ast_log(LOG_WARNING, "ReadFile require an argument!\n"); + return -1; + } + + LOCAL_USER_ADD(u); s = ast_strdupa(data); if (!s) { ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); return -1; } @@ -76,18 +83,17 @@ static int readfile_exec(struct ast_channel *chan, void *data) if (!varname || !file) { ast_log(LOG_ERROR, "No file or variable specified!\n"); + LOCAL_USER_REMOVE(u); return -1; } - LOCAL_USER_ADD(u); if (length) { if ((sscanf(length, "%d", &len) != 1) || (len < 0)) { ast_log(LOG_WARNING, "%s is not a positive number, defaulting length to max\n", length); len = 0; } } - - + returnvar = ast_read_textfile(file); if(len > 0){ if(len < strlen(returnvar)) |