sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "format_ogg_vorbis: Clear ogg/vorbis data structures on close"

This commit is contained in:
Joshua Colp 2017-04-19 08:38:16 -05:00 committed by Gerrit Code Review
parent b0c72da6fc 4fb9f5d60e
commit e756a9e063
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
formats/format_ogg_vorbis.c
View File

@ -158,6 +158,7 @@ static int ogg_vorbis_rewrite(struct ast_filestream *s,
if (vorbis_encode_init_vbr(&tmp->vi, 1, DEFAULT_SAMPLE_RATE, 0.4)) {
ast_log(LOG_ERROR, "Unable to initialize Vorbis encoder!\n");
vorbis_info_clear(&tmp->vi);
return -1;
}
@ -273,6 +274,13 @@ static void ogg_vorbis_close(struct ast_filestream *fs)
* and write out the rest of the data */
vorbis_analysis_wrote(&s->vd, 0);
write_stream(s, fs->f);
/* Cleanup */
ogg_stream_clear(&s->os);
vorbis_block_clear(&s->vb);
vorbis_dsp_clear(&s->vd);
vorbis_comment_clear(&s->vc);
vorbis_info_clear(&s->vi);
} else {
/* clear OggVorbis_File handle */
ov_clear(&s->ov_f);