[asterisk-commits] tilghman: branch 1.6.1 r193958 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue May 12 15:42:17 2009
New Revision: 193958

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=193958
Log:
Merged revisions 193956 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r193956 | tilghman | 2009-05-12 15:40:22 -0500 (Tue, 12 May 2009) | 13 lines
  
  Merged revisions 193955 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r193955 | tilghman | 2009-05-12 15:39:21 -0500 (Tue, 12 May 2009) | 6 lines
    
    Avoid initializing routines if the authentication fails.  Fixes a crash (RR) issue.
    (closes issue #14508)
     Reported by: tiziano
     Patches: 
           20090221_2_wrongmailbox.diff.txt uploaded by tiziano (license 377)
  ........
................

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.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=193958&r1=193957&r2=193958
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Tue May 12 15:42:17 2009
@@ -8893,6 +8893,10 @@
 	/* If ADSI is supported, setup login screen */
 	adsi_begin(chan, &useadsi);
 
+	if (!valid) {
+		goto out;
+	}
+
 #ifdef IMAP_STORAGE
 	pthread_once(&ts_vmstate.once, ts_vmstate.key_init);
 	pthread_setspecific(ts_vmstate.key, &vms);
@@ -8904,9 +8908,6 @@
 	vmstate_insert(&vms);
 	init_vm_state(&vms);
 #endif
-	if (!valid)
-		goto out;
-
 	if (!(vms.deleted = ast_calloc(vmu->maxmsg, sizeof(int)))) {
 		ast_log(AST_LOG_ERROR, "Could not allocate memory for deleted message storage!\n");
 		cmd = ast_play_and_wait(chan, "an-error-has-occured");
@@ -9458,7 +9459,9 @@
 	}
 	/*  before we delete the state, we should copy pertinent info
 	 *  back to the persistent model */
-	vmstate_delete(&vms);
+	if (vmu) {
+		vmstate_delete(&vms);
+	}
 #endif
 	if (vmu)
 		free_user(vmu);