mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
Do not crash if we are not passed in a followme id.
(closes issue #14106) Reported by: ys Patches: app_followme.c.2.diff uploaded by ys (license 281) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@165537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -960,22 +960,26 @@ static int app_exec(struct ast_channel *chan, void *data)
|
|||||||
AST_APP_ARG(options);
|
AST_APP_ARG(options);
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (ast_strlen_zero(data)) {
|
||||||
|
ast_log(LOG_WARNING, "%s requires an argument (followmeid)\n",app);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
if (!(argstr = ast_strdupa((char *)data))) {
|
if (!(argstr = ast_strdupa((char *)data))) {
|
||||||
ast_log(LOG_ERROR, "Out of memory!\n");
|
ast_log(LOG_ERROR, "Out of memory!\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data) {
|
|
||||||
ast_log(LOG_WARNING, "%s requires an argument (followmeid)\n",app);
|
AST_STANDARD_APP_ARGS(args, argstr);
|
||||||
|
if (ast_strlen_zero(args.followmeid)) {
|
||||||
|
ast_log(LOG_WARNING, "%s requires an argument (followmeid)\n", app);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
u = ast_module_user_add(chan);
|
u = ast_module_user_add(chan);
|
||||||
|
|
||||||
AST_STANDARD_APP_ARGS(args, argstr);
|
AST_LIST_LOCK(&followmes);
|
||||||
|
|
||||||
if (!ast_strlen_zero(args.followmeid))
|
|
||||||
AST_LIST_LOCK(&followmes);
|
|
||||||
AST_LIST_TRAVERSE(&followmes, f, entry) {
|
AST_LIST_TRAVERSE(&followmes, f, entry) {
|
||||||
if (!strcasecmp(f->name, args.followmeid) && (f->active))
|
if (!strcasecmp(f->name, args.followmeid) && (f->active))
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user