kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 231688 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r231688 | mnicholson | 2009-11-30 15:31:55 -0600 (Mon, 30 Nov 2009) | 15 lines
  
  Merged revisions 231614 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r231614 | mnicholson | 2009-11-30 15:11:44 -0600 (Mon, 30 Nov 2009) | 8 lines
    
    Remove duplicate entries from voicemail format lists. This prevents app_voicemail from entering an infinite loop when the same format is specified twice in the format list.
    
    (closes issue #15625)
    Reported by: Shagg63
    Tested by: mnicholson
    
    Review: https://reviewboard.asterisk.org/r/429/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@231690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2009-11-30 21:36:53 +00:00
parent 03f3ad606e
commit c72b7f39bd
4 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/app.c
View File

@@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/indications.h"
#include "asterisk/linkedlists.h"
#define MAX_OTHER_FORMATS 10
#define AST_MAX_FORMATS 10
static AST_RWLIST_HEAD_STATIC(groups, ast_group_info);
@@ -620,8 +620,8 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
char *fmts;
char comment[256];
int x, fmtcnt = 1, res = -1, outmsg = 0;
struct ast_filestream *others[MAX_OTHER_FORMATS];
char *sfmt[MAX_OTHER_FORMATS];
struct ast_filestream *others[AST_MAX_FORMATS];
char *sfmt[AST_MAX_FORMATS];
char *stringp = NULL;
time_t start, end;
struct ast_dsp *sildet = NULL; /* silence detector dsp */
@@ -667,8 +667,8 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
sfmt[0] = ast_strdupa(fmts);
while ((fmt = strsep(&stringp, "|"))) {
if (fmtcnt > MAX_OTHER_FORMATS - 1) {
ast_log(LOG_WARNING, "Please increase MAX_OTHER_FORMATS in app.c\n");
if (fmtcnt > AST_MAX_FORMATS - 1) {
ast_log(LOG_WARNING, "Please increase AST_MAX_FORMATS in file.h\n");
break;
}
sfmt[fmtcnt++] = ast_strdupa(fmt);
@@ -850,7 +850,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
}
if (prepend && outmsg) {
struct ast_filestream *realfiles[MAX_OTHER_FORMATS];
struct ast_filestream *realfiles[AST_MAX_FORMATS];
struct ast_frame *fr;
for (x = 0; x < fmtcnt; x++) {