aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-12-07 18:17:28 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-12-07 18:17:28 +0000
commit812d6dc8392ef8b58f065578eaa4957737f1d59c (patch)
treef36f958570723bcf161b9ae22148399ea3eb9139 /res
parentf336d2a0c7c4680b025ee38274a3a6485a2e09c9 (diff)
Merged revisions 48356 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r48356 | russell | 2006-12-07 13:14:13 -0500 (Thu, 07 Dec 2006) | 3 lines Ensure that the file position is not incremented beyond the total number of files available for playback. (issue #8539, ulogic) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@48357 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_musiconhold.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 97db7c873..267cbc92b 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -242,6 +242,7 @@ static int ast_moh_files_next(struct ast_channel *chan)
if (!ast_openstream_full(chan, state->class->filearray[state->pos], chan->language, 1)) {
ast_log(LOG_WARNING, "Unable to open file '%s': %s\n", state->class->filearray[state->pos], strerror(errno));
state->pos++;
+ state->pos %= state->class->total_files;
return -1;
}