diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-07 18:21:21 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-07 18:21:21 +0000 |
| commit | 472a2840935bc3afe9a6e774114f755d478b0bde (patch) | |
| tree | 0d1d7221c175c5f026f83df0890da2f02bc2dbc8 /res | |
| parent | fa3680b8820ff6a3f25663f0a6359074bdbc3ff8 (diff) | |
Merged revisions 48357 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48357 | russell | 2006-12-07 13:17:28 -0500 (Thu, 07 Dec 2006) | 11 lines
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/trunk@48358 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 2085cc4f9..f560432bb 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; } |