kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 02:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 193956 via svnmerge from

Browse Source 
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)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@193957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-05-12 20:42:09 +00:00
parent 5a092bedca
commit 538c562092
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_voicemail.c
View File

@@ -7894,6 +7894,10 @@ static int vm_execmain(struct ast_channel *chan, void *data)
/* If ADSI is supported, setup login screen */ /* If ADSI is supported, setup login screen */
adsi_begin(chan, &useadsi); adsi_begin(chan, &useadsi);
if (!valid) {
goto out;
}
#ifdef IMAP_STORAGE #ifdef IMAP_STORAGE
pthread_once(&ts_vmstate.once, ts_vmstate.key_init); pthread_once(&ts_vmstate.once, ts_vmstate.key_init);
pthread_setspecific(ts_vmstate.key, &vms); pthread_setspecific(ts_vmstate.key, &vms);
@@ -7903,9 +7907,6 @@ static int vm_execmain(struct ast_channel *chan, void *data)
vmstate_insert(&vms); vmstate_insert(&vms);
init_vm_state(&vms); init_vm_state(&vms);
#endif #endif
if (!valid)
goto out;
if (!(vms.deleted = ast_calloc(vmu->maxmsg, sizeof(int)))) { if (!(vms.deleted = ast_calloc(vmu->maxmsg, sizeof(int)))) {
ast_log(LOG_ERROR, "Could not allocate memory for deleted message storage!\n"); ast_log(LOG_ERROR, "Could not allocate memory for deleted message storage!\n");
cmd = ast_play_and_wait(chan, "an-error-has-occured"); cmd = ast_play_and_wait(chan, "an-error-has-occured");
@@ -8314,7 +8315,9 @@ out:
} }
/* before we delete the state, we should copy pertinent info /* before we delete the state, we should copy pertinent info
* back to the persistent model */ * back to the persistent model */
vmstate_delete(&vms); if (vmu) {
vmstate_delete(&vms);
}
#endif #endif
if (vmu) if (vmu)
free_user(vmu); free_user(vmu);