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 /apps/app_voicemail.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 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index f86e4c1f9..7db2a2564 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -12092,7 +12092,9 @@ static int acf_vm_info(struct ast_channel *chan, const char *cmd, char *args, ch } else if (!strncasecmp(arg.attribute, "pager", 5)) { ast_copy_string(buf, vmu->pager, len); } else if (!strncasecmp(arg.attribute, "language", 8)) { - ast_copy_string(buf, S_OR(vmu->language, ast_channel_language(chan)), len); + const char *lang = S_OR(vmu->language, chan ? + ast_channel_language(chan) : ast_defaultlanguage); + ast_copy_string(buf, lang, len); } else if (!strncasecmp(arg.attribute, "locale", 6)) { ast_copy_string(buf, vmu->locale, len); } else if (!strncasecmp(arg.attribute, "tz", 2)) { |