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_chanisavail.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_chanisavail.c')
-rwxr-xr-x | apps/app_chanisavail.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c index 6f60fba15..5c9d4e707 100755 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -72,16 +72,17 @@ static int chanavail_exec(struct ast_channel *chan, void *data) int res=-1, inuse=-1, option_state=0; int status; struct localuser *u; - char info[512], tmp[512], trychan[512], *peers, *tech, *number, *rest, *cur, *options, *stringp; + char *info, tmp[512], trychan[512], *peers, *tech, *number, *rest, *cur, *options, *stringp; struct ast_channel *tempchan; - if (!data) { + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "ChanIsAvail requires an argument (Zap/1&Zap/2)\n"); return -1; } + LOCAL_USER_ADD(u); - strncpy(info, (char *)data, sizeof(info)-1); + info = ast_strdupa(data); stringp = info; strsep(&stringp, "|"); options = strsep(&stringp, "|"); |