[asterisk-commits] mmichelson: branch 1.6.1 r175593 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Feb 13 13:52:03 2009
New Revision: 175593

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=175593
Log:
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)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=175593&r1=175592&r2=175593
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Fri Feb 13 13:52:03 2009
@@ -8792,7 +8792,8 @@
 #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