diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-30 23:44:42 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-30 23:44:42 +0000 |
| commit | 235e93604c4c3b0422ca406039e008cafea4f459 (patch) | |
| tree | 0a7846573200a81f940274442cf81d2382268d80 /apps | |
| parent | d1e784650ed057f33ff7565ff86f7e2361814233 (diff) | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 0e4877c6c..31e352db7 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -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)) { snprintf(prefile,sizeof(prefile), "%s%s/%s/greet", VM_SPOOL_DIR, vmu->context, vms->username); 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); +#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 == '#') 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)) { snprintf(prefile,sizeof(prefile), "%s%s/%s/unavail", VM_SPOOL_DIR, vmu->context, vms->username); 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); +#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 == '#') return cmd; } snprintf(prefile,sizeof(prefile), "%s%s/%s/busy", VM_SPOOL_DIR, vmu->context, vms->username); 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); +#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 == '#') return cmd; } @@ -6033,15 +6045,27 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct switch (cmd) { case '1': 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); +#else + cmd = play_record_review(chan,"vm-rec-unv",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms); +#endif break; case '2': 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); +#else + cmd = play_record_review(chan,"vm-rec-busy",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms); +#endif break; case '3': 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); +#else + cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms); +#endif break; case '4': 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; RETRIEVE(prefile, -1); 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); +#else + play_record_review(chan, "vm-rec-temp", prefile, maxgreet, fmtc, 0, vmu, &duration, NULL, record_gain, vms); +#endif cmd = 't'; } else { switch (cmd) { case '1': +#ifndef IMAP_STORAGE 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; case '2': DELETE(prefile, -1, prefile); |