diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-13 19:52:03 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-13 19:52:03 +0000 |
| commit | cb3bc02e9d1c362707fabe6b5b95a9864b8140db (patch) | |
| tree | 259f304cbf2c0760ea694507344597eb84a7bbea /apps | |
| parent | a6ef3df6ac1a371b80c1c74cb03dc4fc1847f401 (diff) | |
Merged revisions 175591 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r175591 | mmichelson | 2009-02-13 13:49:38 -0600 (Fri, 13 Feb 2009) | 22 lines
Merged revisions 175590 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r175590 | mmichelson | 2009-02-13 13:47:48 -0600 (Fri, 13 Feb 2009) | 16 lines
Fix a potential crash situation when using IMAP voicemail
If calling into VoiceMailMain when using IMAP storage, it was
possible to crash Asterisk by hanging up the phone when prompted
for a voicemail mailbox. This patch fixes the issue.
While it may appear that this patch is superficial, it allows code
execution to continue to the failure case just below the IMAP_STORAGE
code block where this patch has been applied
(closes issue #14473)
Reported by: dwpaul
Patches:
voicemail_imap_crash_no_mailbox.patch uploaded by dwpaul (license 689)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@175593 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 504396143..d0f47eebc 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -8792,7 +8792,8 @@ static int vm_execmain(struct ast_channel *chan, void *data) #ifdef IMAP_STORAGE vms.interactive = 1; vms.updated = 1; - ast_copy_string(vms.context, vmu->context, sizeof(vms.context)); + if (vmu) + ast_copy_string(vms.context, vmu->context, sizeof(vms.context)); vmstate_insert(&vms); init_vm_state(&vms); #endif |