From 9caba9cc9b9b64f33f1ff3272afe5d4b71862391 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Fri, 5 Mar 2004 17:50:29 +0000 Subject: valgrind memleak fixes CVS patchset: 6218 CVS date: 2004/03/05 17:50:29 --- src/demuxers/demux_matroska.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/demuxers/demux_matroska.c') diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 5760a6c61..6c2b19484 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_matroska.c,v 1.22 2004/02/12 23:31:19 jstembridge Exp $ + * $Id: demux_matroska.c,v 1.23 2004/03/05 17:50:30 mroi Exp $ * * demultiplexer for matroska streams * @@ -1762,6 +1762,7 @@ static void demux_matroska_dispose (demux_plugin_t *this_gen) { free (track); } + dispose_ebml_parser(this->ebml); free (this); } @@ -1839,7 +1840,7 @@ static int demux_matroska_get_optional_data (demux_plugin_t *this_gen, static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *stream, input_plugin_t *input) { - demux_matroska_t *this; + demux_matroska_t *this = NULL; ebml_parser_t *ebml = NULL; lprintf("trying to open %s...\n", input->get_mrl(input)); @@ -1852,7 +1853,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str input->seek(input, 0, SEEK_SET); ebml = new_ebml_parser(stream->xine, input); if (!ebml_check_header(ebml)) - return NULL; + goto error; } break; -- cgit v1.2.3