summaryrefslogtreecommitdiff
path: root/formats
diff options
context:
space:
mode:
authorSean Bright <sean.bright@gmail.com>2017-04-14 13:51:31 -0400
committerSean Bright <sean.bright@gmail.com>2017-04-15 12:15:57 -0500
commit4fb9f5d60ec0a5a4e607fb2517e95a95abee53af (patch)
tree899066da8da2c5311baf8a38e4875e69c2b43850 /formats
parent2e6075c51fe0466d7410b02efb68f1d47aedb284 (diff)
format_ogg_vorbis: Clear ogg/vorbis data structures on close
On filestream close, we need to clear out the ogg & vorbis data structures to prevent a memory leak. ASTERISK-26169 #close Reported by: Ivan Myalkin Change-Id: Iee94c5a5d5bdafbf8b181c5c064d15d90ace8274
Diffstat (limited to 'formats')
-rw-r--r--formats/format_ogg_vorbis.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index d4212a169..c0f8c197d 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -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);