kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-15 16:16:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix looping forever when no input received in certain voicemail menu scenarios.

Browse Source 
Specifically, prompting for an extension (when leaving or forwarding a message)
or when prompting for a digit (when saving a message or changing folders).

ABE-2122
SWP-1268


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@258432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-04-21 21:45:36 +00:00
parent 4af3d8699b
commit 5c5677868d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/app_voicemail.c
+10 -2
View File
@@ -5094,10 +5094,16 @@ static int get_folder(struct ast_channel *chan, int start)
static int get_folder2(struct ast_channel *chan, char *fn, int start)
{
int res = 0;
int loops = 0;
res = ast_play_and_wait(chan, fn); /* Folder name */
while (((res < '0') || (res > '9')) &&
(res != '#') && (res >= 0)) {
(res != '#') && (res >= 0) &&
loops < 4) {
res = get_folder(chan, 0);
loops++;
}
if (loops == 4) { /* give up */
return '#';
}
return res;
}
@@ -5283,6 +5289,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
int valid_extensions = 0;
char *dir;
int curmsg;
int prompt_played = 0;
if (vms == NULL) return -1;
dir = vms->curdir;
@@ -5364,7 +5371,8 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
} else {
/* Ask for an extension */
res = ast_streamfile(chan, "vm-extension", chan->language); /* "extension" */
if (res)
prompt_played++;
if (res || prompt_played > 4)
break;
if ((res = ast_readstring(chan, username, sizeof(username) - 1, 2000, 10000, "#") < 0))
break;