kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unsafe uses of ast_context pointers.

Browse Source 
Although ast_context_find, ast_context_find_or_create and
ast_context_destroy perform locking of the contexts table,
any context pointer can become invalid at any time that the
contexts table is unlocked. This change adds locking around
all complete operations involving these functions.

Places where ast_context_find was followed by ast_context_destroy
have been replaced with calls ast_context_destroy_by_name.

ASTERISK-25094 #close
Reported by: Corey Farrell

Change-Id: I1866b6787730c9c4f3f836b6133ffe9c820734fa
This commit is contained in:
Corey Farrell
2015-06-08 11:09:57 -04:00
parent 8785d0ccbf
commit 80621ce3c5
9 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pbx/pbx_config.c
View File

@@ -133,8 +133,6 @@ static char *complete_dialplan_remove_context(struct ast_cli_args *);
static char *handle_cli_dialplan_remove_context(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct ast_context *con;
switch (cmd) {
case CLI_INIT:
e->command = "dialplan remove context";
@@ -150,16 +148,11 @@ static char *handle_cli_dialplan_remove_context(struct ast_cli_entry *e, int cmd
return CLI_SHOWUSAGE;
}
con = ast_context_find(a->argv[3]);
if (!con) {
ast_cli(a->fd, "There is no such context as '%s'\n",
a->argv[3]);
return CLI_SUCCESS;
if (ast_context_destroy_by_name(a->argv[3], NULL)) {
ast_cli(a->fd, "There is no such context as '%s'\n", a->argv[3]);
return CLI_SUCCESS;
} else {
ast_context_destroy(con, registrar);
ast_cli(a->fd, "Removing context '%s'\n",
a->argv[3]);
ast_cli(a->fd, "Removed context '%s'\n", a->argv[3]);
return CLI_SUCCESS;
}
}