From e0e32a3bd8fffd0b517b701fa194c9a9732d01ac Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Wed, 21 Apr 2010 21:56:09 +0000 Subject: Merged revisions 258432 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r258432 | jpeeler | 2010-04-21 16:45:36 -0500 (Wed, 21 Apr 2010) | 8 lines Fix looping forever when no input received in certain voicemail menu scenarios. 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/trunk@258433 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 2a8ae65a8..48ef85ef7 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6501,10 +6501,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; } @@ -6819,6 +6825,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st int curmsg; char urgent_str[7] = ""; char tmptxtfile[PATH_MAX]; + int prompt_played = 0; #ifndef IMAP_STORAGE char msgfile[PATH_MAX], textfile[PATH_MAX], backup[PATH_MAX], backup_textfile[PATH_MAX]; #endif @@ -6904,7 +6911,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; -- cgit v1.2.3