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

Merge "res_musiconhold.c: Fix format ref leak when parsing MOH config class."

Browse Source
This commit is contained in:
George Joseph
2017-01-26 16:05:07 -06:00
committed by Gerrit Code Review
parent 2484c3ee39 56854f22d2
commit 071aa069e6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_musiconhold.c
View File

@@ -1058,13 +1058,14 @@ static void moh_parse_options(struct ast_variable *var, struct mohclass *mohclas
ast_set_flag(mohclass, MOH_RANDSTART); ast_set_flag(mohclass, MOH_RANDSTART);
} }
} else if (!strcasecmp(var->name, "format")) { } else if (!strcasecmp(var->name, "format")) {
ao2_cleanup(mohclass->format);
mohclass->format = ast_format_cache_get(var->value); mohclass->format = ast_format_cache_get(var->value);
if (!mohclass->format) { if (!mohclass->format) {
ast_log(LOG_WARNING, "Unknown format '%s' -- defaulting to SLIN\n", var->value); ast_log(LOG_WARNING, "Unknown format '%s' -- defaulting to SLIN\n", var->value);
mohclass->format = ao2_bump(ast_format_slin); mohclass->format = ao2_bump(ast_format_slin);
} }
} }
} }
} }
static int moh_add_file(struct mohclass *class, const char *filepath) static int moh_add_file(struct mohclass *class, const char *filepath)