bilboed gst-ffmpeg: gst-ffmpeg/ gst-ffmpeg/ext/ffmpeg/

CVS Root:       /cvs/gstreamer
Module:         gst-ffmpeg
Changes by:     bilboed
Date:           Wed Dec 03 2008  17:43:59 UTC

Log message:
reviewed by: Edward Hervey  <[email protected]>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_finalize):
Fix check for memory to free.
Fixes #560644

Modified files:
    .               : ChangeLog
    ext/ffmpeg      : gstffmpegdec.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.526&r2=1.527
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c.diff?r1=1.215&r2=1.216

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -d -r1.526 -r1.527
--- ChangeLog	27 Nov 2008 23:39:51 -0000	1.526
+++ ChangeLog	3 Dec 2008 17:43:44 -0000	1.527
@@ -1,3 +1,11 @@
+2008-12-03  Yotam Shtossel  <[email protected]>
+
+	reviewed by: Edward Hervey  <[email protected]>
+	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_finalize):
+	Fix check for memory to free.
+	Fixes #560644
 2008-11-27  Jan Schmidt  <[email protected]>
 
 	* configure.ac:
Index: gstffmpegdec.c
RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdec.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- gstffmpegdec.c	7 Nov 2008 11:43:42 -0000	1.215
+++ gstffmpegdec.c	3 Dec 2008 17:43:45 -0000	1.216
@@ -370,13 +370,16 @@
 {
   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);
 }

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/