diff options
author | Edward Hervey <bilboed@bilboed.com> | 2008-12-03 17:43:45 +0000 |
---|---|---|
committer | Edward Hervey <bilboed@bilboed.com> | 2008-12-03 17:43:45 +0000 |
commit | 4540e7d7528cf58f504a0b21925ed2437b99cc8a (patch) | |
tree | 4d5d4a8d6ce02c6338e8f2c243a5aaa3cab284d6 | |
parent | dcdac9e00714ef455336532b186187bcc701b6ad (diff) | |
download | gst-libav-4540e7d7528cf58f504a0b21925ed2437b99cc8a.tar.gz |
ext/ffmpeg/gstffmpegdec.c: Fix check for memory to free.
Original commit message from CVS:
reviewed by: Edward Hervey <edward.hervey@collabora.co.uk>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_finalize):
Fix check for memory to free.
Fixes #560644
-rw-r--r-- | ChangeLog | 8 | ||||
m--------- | common | 0 | ||||
-rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 11 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2008-12-03 Yotam Shtossel <sh.yotam@gmail.com> + + reviewed by: Edward Hervey <edward.hervey@collabora.co.uk> + + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_finalize): + Fix check for memory to free. + Fixes #560644 + 2008-11-27 Jan Schmidt <jan.schmidt@sun.com> * configure.ac: diff --git a/common b/common -Subproject e4b2fe44724e1c1a6e816ae4fbbae43d7f68f1e +Subproject 9a486164b87586f7b936a55b1ee56a14cd4e2c7 diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 5488990..a70136b 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -370,13 +370,16 @@ gst_ffmpegdec_finalize (GObject * object) { GstFFMpegDec *ffmpegdec = (GstFFMpegDec *) object; - if (ffmpegdec->opened) { - - /* clean up remaining allocated data */ + if (ffmpegdec->context != NULL) { av_free (ffmpegdec->context); - av_free (ffmpegdec->picture); + ffmpegdec->context = NULL; + } + if (ffmpegdec->picture != NULL) { + av_free (ffmpegdec->picture); + ffmpegdec->picture = NULL; } + G_OBJECT_CLASS (parent_class)->finalize (object); } |