From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 12 May 2009 20:39:21 +0000 (+0000)
Subject: Avoid initializing routines if the authentication fails.  Fixes a crash (RR) issue.
X-Git-Tag: 1.4.25-rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6ba2472bd5da519eb888559498a578a2f1d9f79;p=thirdparty%2Fasterisk.git

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)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@193955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index a1cdf386fd..f3e423ec1c 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -7441,6 +7441,10 @@ static int vm_execmain(struct ast_channel *chan, void *data)
 	/* 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);
@@ -7452,9 +7456,6 @@ static int vm_execmain(struct ast_channel *chan, void *data)
 	vmstate_insert(&vms);
 	init_vm_state(&vms);
 #endif
-	if (!valid)
-		goto out;
-
 	if (!(vms.deleted = ast_calloc(vmu->maxmsg, sizeof(int)))) {
 		/* TODO: Handle memory allocation failure */
 	}
@@ -7869,7 +7870,9 @@ out:
 	}
 	/*  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);