[gst-cvs] gst-plugins-good: matroska: don't alter passed data and especialy don' t leak.

Stefan Kost ensonic at kemper.freedesktop.org
Tue Mar 31 07:29:14 PDT 2009


Module: gst-plugins-good
Branch: master
Commit: 5ac6b84475657f7e76bb092273e6daed0c26d0dd
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=5ac6b84475657f7e76bb092273e6daed0c26d0dd

Author: Stefan Kost <ensonic at users.sf.net>
Date:   Tue Mar 31 17:06:50 2009 +0300

matroska: don't alter passed data and especialy don't leak.

If we need different size, Make a copy, work with that and free it.

---

 gst/matroska/matroska-demux.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 118a3d6..6b9c377 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -4981,9 +4981,8 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
         return NULL;
       }
       if (size < sizeof (gst_riff_strf_vids)) {
-        vids =
-            (gst_riff_strf_vids *) g_realloc (vids,
-            sizeof (gst_riff_strf_vids));
+        vids = g_new (gst_riff_strf_vids, 1);
+        memcpy (vids, data, size);
       }
 
       /* little-endian -> byte-order */
@@ -5011,6 +5010,9 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
 
       if (buf)
         gst_buffer_unref (buf);
+
+      if (vids != (gst_riff_strf_vids *) data)
+        g_free (vids);
     }
   } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_UNCOMPRESSED)) {
     guint32 fourcc = 0;





More information about the Gstreamer-commits mailing list