sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 51750 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51750 | russell | 2007-01-23 15:33:15 -0600 (Tue, 23 Jan 2007) | 4 lines

When traversing the list of manager actions, the iterator needs to be
initialized to the list head *after* locking the list.  Also, lock the actions
list in one place it is being accessed where it was not being done.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51751 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant 2007-01-23 21:38:31 +00:00
parent 80435b54a5
commit 8137080816
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main/manager.c
View File

@ -2076,18 +2076,18 @@ static int process_message(struct mansession *s, const struct message *m)
astman_send_error(s, m, "Permission denied");
return 0;
}
/* XXX should we protect the list navigation ? */
ast_mutex_lock(&actionlock);
for (tmp = first_action ; tmp; tmp = tmp->next) {
if (!strcasecmp(action, tmp->action)) {
if ((s->writeperm & tmp->authority) == tmp->authority) {
if (tmp->func(s, m)) /* error */
return -1;
} else {
astman_send_error(s, m, "Permission denied");
}
break;
}
if (strcasecmp(action, tmp->action))
continue;
if ((s->writeperm & tmp->authority) == tmp->authority) {
if (tmp->func(s, m)) /* error */
return -1;
} else
astman_send_error(s, m, "Permission denied");
break;
}
ast_mutex_unlock(&actionlock);
if (!tmp)
astman_send_error(s, m, "Invalid/unknown command. Use Action: ListCommands to show available commands.");
if (ret)
@ -2389,7 +2389,7 @@ int __manager_event(int category, const char *event,
*/
int ast_manager_unregister(char *action)
{
struct manager_action *cur = first_action, *prev = first_action;
struct manager_action *cur, *prev;
ast_mutex_lock(&actionlock);
for (cur = first_action, prev = NULL; cur; prev = cur, cur = cur->next) {