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_directory.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_directory.c')
| -rwxr-xr-x | apps/app_directory.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index 1ebd77b1d..0385d50ba 100755 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -410,11 +410,13 @@ static int directory_exec(struct ast_channel *chan, void *data) int last = 1; char *context, *dialcontext, *dirintro, *options; - if (!data) { + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Directory requires an argument (context[,dialcontext])\n"); return -1; } + LOCAL_USER_ADD(u); + context = ast_strdupa(data); dialcontext = strchr(context, '|'); if (dialcontext) { @@ -431,10 +433,10 @@ static int directory_exec(struct ast_channel *chan, void *data) dialcontext = context; cfg = realtime_directory(context); - if (!cfg) + if (!cfg) { + LOCAL_USER_REMOVE(u); return -1; - - LOCAL_USER_ADD(u); + } dirintro = ast_variable_retrieve(cfg, context, "directoryintro"); if (!dirintro || ast_strlen_zero(dirintro)) |