diff options
| author | cboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-14 09:12:34 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-14 13:11:20 +0200 |
| commit | fe3c4810e1c8b535caf07df8e4434e322d3e6fc0 (patch) | |
| tree | cbcd859f358c479223eb7b0aa2a2d3dfe1c81b69 /libmpdemux/demux_ogg.c | |
| parent | b492561241f2a3263a8ab558fafc957130dbdfc1 (diff) | |
| download | mpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.bz2 mpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.xz | |
cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ogg.c')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index fe6bd27601..1883c36cd1 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -436,11 +436,10 @@ static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, sh_sub_t *sh; // in case of malicious files with more than one lang per track: - if (ogg_d->text_langs[index]) - free(ogg_d->text_langs[index]); + free(ogg_d->text_langs[index]); ogg_d->text_langs[index] = strdup(val); sh = d->s_streams[index]; - if (sh && sh->lang) + if (sh) free(sh->lang); if (sh) sh->lang = strdup(val); @@ -1606,13 +1605,11 @@ static void demux_close_ogg(demuxer_t *demuxer) } free(ogg_d->subs); } - if (ogg_d->syncpoints) - free(ogg_d->syncpoints); - if (ogg_d->text_ids) - free(ogg_d->text_ids); + free(ogg_d->syncpoints); + free(ogg_d->text_ids); if (ogg_d->text_langs) { for (i = 0; i < ogg_d->n_text; i++) - if (ogg_d->text_langs[i]) free(ogg_d->text_langs[i]); + free(ogg_d->text_langs[i]); free(ogg_d->text_langs); } free(ogg_d); |