diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-12-04 07:31:10 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-12-04 07:31:11 -0600 |
| commit | 8d79446a111835e71e7532a97bd71c7630f8293b (patch) | |
| tree | bb1e29f29b511b795a5e1d48e6e959eb6b608499 | |
| parent | fc1186bf2d5f1cab34bbe0d72f4f667044e612d0 (diff) | |
| parent | 69457b8d61ddc62e018dd4037fb42a231f73c3b5 (diff) | |
Merge "Fix crash in audiohook translate to slin"
| -rw-r--r-- | main/audiohook.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/main/audiohook.c b/main/audiohook.c index 73bb0ff11..e3089131e 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -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); } |