Merged revisions 66671 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r66671 | mmichelson | 2007-05-30 18:26:39 -0500 (Wed, 30 May 2007) | 2 lines Fixed seg-faults when recording greetings in voicemail with IMAP enabled. (Issue No. 9734, reported by xmarksthespot, patched by me) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@66672 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
d1e784650e
commit
235e93604c
|
@ -5981,7 +5981,11 @@ static int vm_newuser(struct ast_channel *chan, struct ast_vm_user *vmu, struct
|
||||||
if (ast_test_flag(vmu, VM_FORCENAME)) {
|
if (ast_test_flag(vmu, VM_FORCENAME)) {
|
||||||
snprintf(prefile,sizeof(prefile), "%s%s/%s/greet", VM_SPOOL_DIR, vmu->context, vms->username);
|
snprintf(prefile,sizeof(prefile), "%s%s/%s/greet", VM_SPOOL_DIR, vmu->context, vms->username);
|
||||||
if (ast_fileexists(prefile, NULL, NULL) < 1) {
|
if (ast_fileexists(prefile, NULL, NULL) < 1) {
|
||||||
|
#ifndef IMAP_STORAGE
|
||||||
cmd = play_record_review(chan, "vm-rec-name", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
cmd = play_record_review(chan, "vm-rec-name", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
||||||
|
#else
|
||||||
|
cmd = play_record_review(chan, "vm-rec-name", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
|
||||||
|
#endif
|
||||||
if (cmd < 0 || cmd == 't' || cmd == '#')
|
if (cmd < 0 || cmd == 't' || cmd == '#')
|
||||||
return cmd;
|
return cmd;
|
||||||
}
|
}
|
||||||
|
@ -5991,14 +5995,22 @@ static int vm_newuser(struct ast_channel *chan, struct ast_vm_user *vmu, struct
|
||||||
if (ast_test_flag(vmu, VM_FORCEGREET)) {
|
if (ast_test_flag(vmu, VM_FORCEGREET)) {
|
||||||
snprintf(prefile,sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, vms->username);
|
snprintf(prefile,sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, vms->username);
|
||||||
if (ast_fileexists(prefile, NULL, NULL) < 1) {
|
if (ast_fileexists(prefile, NULL, NULL) < 1) {
|
||||||
|
#ifndef IMAP_STORAGE
|
||||||
cmd = play_record_review(chan, "vm-rec-unv", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
cmd = play_record_review(chan, "vm-rec-unv", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
||||||
|
#else
|
||||||
|
cmd = play_record_review(chan, "vm-rec-unv", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
|
||||||
|
#endif
|
||||||
if (cmd < 0 || cmd == 't' || cmd == '#')
|
if (cmd < 0 || cmd == 't' || cmd == '#')
|
||||||
return cmd;
|
return cmd;
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(prefile,sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, vms->username);
|
snprintf(prefile,sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, vms->username);
|
||||||
if (ast_fileexists(prefile, NULL, NULL) < 1) {
|
if (ast_fileexists(prefile, NULL, NULL) < 1) {
|
||||||
|
#ifndef IMAP_STORAGE
|
||||||
cmd = play_record_review(chan, "vm-rec-busy", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
cmd = play_record_review(chan, "vm-rec-busy", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
||||||
|
#else
|
||||||
|
cmd = play_record_review(chan, "vm-rec-busy", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
|
||||||
|
#endif
|
||||||
if (cmd < 0 || cmd == 't' || cmd == '#')
|
if (cmd < 0 || cmd == 't' || cmd == '#')
|
||||||
return cmd;
|
return cmd;
|
||||||
}
|
}
|
||||||
|
@ -6033,15 +6045,27 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case '1':
|
case '1':
|
||||||
snprintf(prefile,sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, vms->username);
|
snprintf(prefile,sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, vms->username);
|
||||||
|
#ifndef IMAP_STORAGE
|
||||||
cmd = play_record_review(chan,"vm-rec-unv",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
cmd = play_record_review(chan,"vm-rec-unv",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
||||||
|
#else
|
||||||
|
cmd = play_record_review(chan,"vm-rec-unv",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case '2':
|
case '2':
|
||||||
snprintf(prefile,sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, vms->username);
|
snprintf(prefile,sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, vms->username);
|
||||||
|
#ifndef IMAP_STORAGE
|
||||||
cmd = play_record_review(chan,"vm-rec-busy",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
cmd = play_record_review(chan,"vm-rec-busy",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
||||||
|
#else
|
||||||
|
cmd = play_record_review(chan,"vm-rec-busy",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case '3':
|
case '3':
|
||||||
snprintf(prefile,sizeof(prefile), "%s%s/%s/greet", VM_SPOOL_DIR, vmu->context, vms->username);
|
snprintf(prefile,sizeof(prefile), "%s%s/%s/greet", VM_SPOOL_DIR, vmu->context, vms->username);
|
||||||
|
#ifndef IMAP_STORAGE
|
||||||
cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
||||||
|
#else
|
||||||
|
cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case '4':
|
case '4':
|
||||||
cmd = vm_tempgreeting(chan, vmu, vms, fmtc, record_gain);
|
cmd = vm_tempgreeting(chan, vmu, vms, fmtc, record_gain);
|
||||||
|
@ -6136,12 +6160,20 @@ static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, st
|
||||||
retries = 0;
|
retries = 0;
|
||||||
RETRIEVE(prefile, -1);
|
RETRIEVE(prefile, -1);
|
||||||
if (ast_fileexists(prefile, NULL, NULL) <= 0) {
|
if (ast_fileexists(prefile, NULL, NULL) <= 0) {
|
||||||
|
#ifndef IMAP_STORAGE
|
||||||
play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
||||||
|
#else
|
||||||
|
play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
|
||||||
|
#endif
|
||||||
cmd = 't';
|
cmd = 't';
|
||||||
} else {
|
} else {
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case '1':
|
case '1':
|
||||||
|
#ifndef IMAP_STORAGE
|
||||||
cmd = play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
cmd = play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, NULL);
|
||||||
|
#else
|
||||||
|
cmd = play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
case '2':
|
case '2':
|
||||||
DELETE(prefile, -1, prefile);
|
DELETE(prefile, -1, prefile);
|
||||||
|
|
Reference in New Issue