kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix crash in audiohook translate to slin"

Browse Source
This commit is contained in:
Matt Jordan
2015-12-04 07:31:10 -06:00
committed by Gerrit Code Review
parent fc1186bf2d 69457b8d61
commit 8d79446a11
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/audiohook.c
View File

@@ -824,13 +824,20 @@ static struct ast_frame *audiohook_list_translate_to_slin(struct ast_audiohook_l
return new_frame;
}
if (ast_format_cmp(frame->subclass.format, in_translate->format) == AST_FORMAT_CMP_NOT_EQUAL) {
if (!in_translate->format ||
ast_format_cmp(frame->subclass.format, in_translate->format) != AST_FORMAT_CMP_EQUAL) {
struct ast_trans_pvt *new_trans;
new_trans = ast_translator_build_path(slin, frame->subclass.format);
if (!new_trans) {
return NULL;
}
if (in_translate->trans_pvt) {
ast_translator_free_path(in_translate->trans_pvt);
}
if (!(in_translate->trans_pvt = ast_translator_build_path(slin, frame->subclass.format))) {
return NULL;
}
in_translate->trans_pvt = new_trans;
ao2_replace(in_translate->format, frame->subclass.format);
}