kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +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.0@231691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2009-11-30 21:37:21 +00:00
parent 32152e49a5
commit f9fc028293
4 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_voicemail.c
View File

@@ -9198,7 +9198,7 @@ static int load_config(int reload)
char *cat;
struct ast_variable *var;
const char *val;
char *q, *stringp;
char *q, *stringp, *tmp;
int x;
int tmpadsi[4];
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
@@ -9482,8 +9482,16 @@ static int load_config(int reload)
}
val = ast_variable_retrieve(cfg, "general", "format");
if (!val)
if (!val) {
val = "wav";
} else {
tmp = ast_strdupa(val);
val = ast_format_str_reduce(tmp);
if (!val) {
ast_log(LOG_ERROR, "Error processing format string, defaulting to format 'wav'\n");
val = "wav";
}
}
ast_copy_string(vmfmts, val, sizeof(vmfmts));
skipms = 3000;