diff options
| author | Corey Farrell <git@cfware.com> | 2014-03-27 19:21:44 +0000 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2014-03-27 19:21:44 +0000 |
| commit | fbe0dfaf4410a4ed34cca248d0885ea87c747e27 (patch) | |
| tree | b8adead7bbb0c61a5b1873c5432dd0359af50047 /main/message.c | |
| parent | 44409401ec7d754a2af861f599e88e5199c2ccf0 (diff) | |
Fix dialplan function NULL channel safety issues
(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
Diffstat (limited to 'main/message.c')
| -rw-r--r-- | main/message.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/main/message.c b/main/message.c index 70bda4150..bd706e363 100644 --- a/main/message.c +++ b/main/message.c @@ -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))) { |