kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dialplan function NULL channel safety issues

Browse Source 
(closes issue ASTERISK-23391)
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/3386/
........

Merged revisions 411313 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 411314 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 411315 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Corey Farrell
2014-03-27 19:21:44 +00:00
parent 44409401ec
commit fbe0dfaf44
31 changed files with 315 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/message.c
View File

@@ -871,6 +871,11 @@ static int msg_func_read(struct ast_channel *chan, const char *function,
struct ast_datastore *ds;
struct ast_msg *msg;
if (!chan) {
ast_log(LOG_WARNING, "No channel was provided to %s function.\n", function);
return -1;
}
ast_channel_lock(chan);
if (!(ds = ast_channel_datastore_find(chan, &msg_datastore, NULL))) {
@@ -907,6 +912,11 @@ static int msg_func_write(struct ast_channel *chan, const char *function,
struct ast_datastore *ds;
struct ast_msg *msg;
if (!chan) {
ast_log(LOG_WARNING, "No channel was provided to %s function.\n", function);
return -1;
}
ast_channel_lock(chan);
if (!(ds = msg_datastore_find_or_create(chan))) {
@@ -963,6 +973,11 @@ static int msg_data_func_read(struct ast_channel *chan, const char *function,
struct ast_msg *msg;
const char *val;
if (!chan) {
ast_log(LOG_WARNING, "No channel was provided to %s function.\n", function);
return -1;
}
ast_channel_lock(chan);
if (!(ds = ast_channel_datastore_find(chan, &msg_datastore, NULL))) {
@@ -993,6 +1008,11 @@ static int msg_data_func_write(struct ast_channel *chan, const char *function,
struct ast_datastore *ds;
struct ast_msg *msg;
if (!chan) {
ast_log(LOG_WARNING, "No channel was provided to %s function.\n", function);
return -1;
}
ast_channel_lock(chan);
if (!(ds = msg_datastore_find_or_create(chan))) {