mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-22 02:13:46 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix leaks and invalid memory access as reported by valgrind

Browse source 
Original commit message from CVS:

* check/elements/matroskamux.c: (setup_src_pad), (setup_sink_pad),
(setup_matroskamux), (check_buffer_data), (GST_START_TEST):
* gst/matroska/matroska-mux.c: (gst_matroska_mux_finalize),
(gst_matroska_mux_reset), (gst_matroska_mux_audio_pad_setcaps),
(gst_matroska_mux_start), (gst_matroska_mux_write_data),
(gst_matroska_mux_collected):
Fix leaks and invalid memory access as reported by valgrind
This commit is contained in:
Thomas Vander Stichele 2005-11-01 15:11:16 +00:00
parent c88fb97881
commit b1b1fe52d6
4 changed files with 48 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-11-01 Thomas Vander Stichele <thomas at apestaart dot org>
* check/elements/matroskamux.c: (setup_src_pad), (setup_sink_pad),
(setup_matroskamux), (check_buffer_data), (GST_START_TEST):
* gst/matroska/matroska-mux.c: (gst_matroska_mux_finalize),
(gst_matroska_mux_reset), (gst_matroska_mux_audio_pad_setcaps),
(gst_matroska_mux_start), (gst_matroska_mux_write_data),
(gst_matroska_mux_collected):
Fix leaks and invalid memory access as reported by valgrind
2005-11-01 Thomas Vander Stichele <thomas at apestaart dot org> 2005-11-01 Thomas Vander Stichele <thomas at apestaart dot org>
Patch by: Michal Benes <michal.benes@xeris.cz> Patch by: Michal Benes <michal.benes@xeris.cz>

17
check/elements/matroskamux.c
View file

@ -56,15 +56,16 @@ static GstStaticPadTemplate srcac3template = GST_STATIC_PAD_TEMPLATE ("src",
GstPad * GstPad *
setup_src_pad (GstElement * element, setup_src_pad (GstElement * element,
GstStaticPadTemplate * srctemplate, GstCaps * caps) GstStaticPadTemplate * template, GstCaps * caps)
{ {
GstPad *srcpad, *sinkpad; GstPad *srcpad, *sinkpad;
GstPadTemplate *templ;
GST_DEBUG_OBJECT (element, "setting up sending pad"); GST_DEBUG_OBJECT (element, "setting up sending pad");
/* sending pad */ /* sending pad */
srcpad = templ = gst_static_pad_template_get (template);
gst_pad_new_from_template (gst_static_pad_template_get (srctemplate), srcpad = gst_pad_new_from_template (templ, "src");
"src"); gst_object_unref (templ);
fail_if (srcpad == NULL, "Could not create a srcpad"); fail_if (srcpad == NULL, "Could not create a srcpad");
ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1); ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1);
@ -110,12 +111,14 @@ setup_sink_pad (GstElement * element, GstStaticPadTemplate * template,
GstCaps * caps) GstCaps * caps)
{ {
GstPad *srcpad, *sinkpad; GstPad *srcpad, *sinkpad;
GstPadTemplate *templ;
GST_DEBUG_OBJECT (element, "setting up receiving pad"); GST_DEBUG_OBJECT (element, "setting up receiving pad");
/* receiving pad */ /* receiving pad */
sinkpad = templ = gst_static_pad_template_get (template);
gst_pad_new_from_template (gst_static_pad_template_get (template), sinkpad = gst_pad_new_from_template (templ, "sink");
"sink"); gst_object_unref (templ);
fail_if (sinkpad == NULL, "Could not create a sinkpad"); fail_if (sinkpad == NULL, "Could not create a sinkpad");
srcpad = gst_element_get_pad (element, "src"); srcpad = gst_element_get_pad (element, "src");

21
gst/matroska/matroska-mux.c
View file

@ -258,6 +258,8 @@ gst_matroska_mux_finalize (GObject * object)
gst_object_unref (mux->collect); gst_object_unref (mux->collect);
gst_object_unref (mux->ebml_write); gst_object_unref (mux->ebml_write);
if (mux->writing_app)
g_free (mux->writing_app);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -346,7 +348,7 @@ gst_matroska_mux_reset (GstElement * element)
/* reset writing_app */ /* reset writing_app */
if (mux->writing_app) { if (mux->writing_app) {
free (mux->writing_app); g_free (mux->writing_app);
} }
mux->writing_app = g_strdup ("GStreamer Matroska muxer"); mux->writing_app = g_strdup ("GStreamer Matroska muxer");
@ -752,12 +754,16 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps)
offset += GST_BUFFER_SIZE (buf[i]); offset += GST_BUFFER_SIZE (buf[i]);
} }
if (GST_BUFFER_SIZE (buf[0]) < 1 + 6 + 4) {
GST_WARNING ("First vorbis header too small, ignoring");
} else {
if (memcmp (GST_BUFFER_DATA (buf[0]) + 1, "vorbis", 6) == 0) { if (memcmp (GST_BUFFER_DATA (buf[0]) + 1, "vorbis", 6) == 0) {
guint8 *hdr = GST_BUFFER_DATA (buf[0]) + 1 + 6 + 4; guint8 *hdr = GST_BUFFER_DATA (buf[0]) + 1 + 6 + 4;
audiocontext->channels = GST_READ_UINT8 (hdr); audiocontext->channels = GST_READ_UINT8 (hdr);
audiocontext->samplerate = GST_READ_UINT32_LE (hdr + 1); audiocontext->samplerate = GST_READ_UINT32_LE (hdr + 1);
} }
}
} else { } else {
GST_WARNING ("Vorbis header does not contain " GST_WARNING ("Vorbis header does not contain "
"three buffers (found %d buffers), Ignoring.", bufarr->len); "three buffers (found %d buffers), Ignoring.", bufarr->len);
@ -1031,6 +1037,7 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
g_free (rand); g_free (rand);
gst_ebml_write_binary (ebml, GST_MATROSKA_ID_SEGMENTUID, gst_ebml_write_binary (ebml, GST_MATROSKA_ID_SEGMENTUID,
(guint8 *) segment_uid, 16); (guint8 *) segment_uid, 16);
g_free (segment_uid);
gst_ebml_write_uint (ebml, GST_MATROSKA_ID_TIMECODESCALE, mux->time_scale); gst_ebml_write_uint (ebml, GST_MATROSKA_ID_TIMECODESCALE, mux->time_scale);
mux->duration_pos = ebml->pos; mux->duration_pos = ebml->pos;
/* get duration */ /* get duration */
@ -1046,10 +1053,10 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
/* Query the total length of the track. */ /* Query the total length of the track. */
peerpad = gst_pad_get_peer (thepad); peerpad = gst_pad_get_peer (thepad);
GST_DEBUG ("Querying duration on pad %s:%s", GST_DEBUG_PAD_NAME (thepad)); GST_DEBUG_OBJECT (thepad, "querying duration");
if (gst_pad_query_duration (peerpad, &format, &trackduration)) { if (gst_pad_query_duration (peerpad, &format, &trackduration)) {
GST_DEBUG ("%s:%s - duration: %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (thepad, "%duration: %" GST_TIME_FORMAT,
GST_DEBUG_PAD_NAME (thepad), GST_TIME_ARGS (trackduration)); GST_TIME_ARGS (trackduration));
if ((gdouble) trackduration > duration) { if ((gdouble) trackduration > duration) {
duration = (gdouble) trackduration; duration = (gdouble) trackduration;
} }
@ -1323,12 +1330,12 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux)
/* if there is no best pad, we have reached EOS */ /* if there is no best pad, we have reached EOS */
if (best == NULL) { if (best == NULL) {
GST_DEBUG ("No best pad finishing..."); GST_DEBUG_OBJECT (mux, "No best pad finishing...");
gst_matroska_mux_finish (mux); gst_matroska_mux_finish (mux);
gst_pad_push_event (mux->srcpad, gst_event_new_eos ()); gst_pad_push_event (mux->srcpad, gst_event_new_eos ());
return GST_FLOW_WRONG_STATE; return GST_FLOW_WRONG_STATE;
} }
GST_DEBUG ("Best pad %s.", gst_pad_get_name (best->collect.pad)); GST_DEBUG_OBJECT (best->collect.pad, "best pad");
/* write data */ /* write data */
buf = best->buffer; buf = best->buffer;
@ -1478,7 +1485,7 @@ gst_matroska_mux_collected (GstCollectPads * pads, gpointer user_data)
{ {
GstMatroskaMux *mux = GST_MATROSKA_MUX (user_data); GstMatroskaMux *mux = GST_MATROSKA_MUX (user_data);
GST_DEBUG ("Collected pads"); GST_DEBUG_OBJECT (mux, "Collected pads");
/* start with a header */ /* start with a header */
if (mux->state == GST_MATROSKA_MUX_STATE_START) { if (mux->state == GST_MATROSKA_MUX_STATE_START) {

17
tests/check/elements/matroskamux.c
View file

@ -56,15 +56,16 @@ static GstStaticPadTemplate srcac3template = GST_STATIC_PAD_TEMPLATE ("src",
GstPad * GstPad *
setup_src_pad (GstElement * element, setup_src_pad (GstElement * element,
GstStaticPadTemplate * srctemplate, GstCaps * caps) GstStaticPadTemplate * template, GstCaps * caps)
{ {
GstPad *srcpad, *sinkpad; GstPad *srcpad, *sinkpad;
GstPadTemplate *templ;
GST_DEBUG_OBJECT (element, "setting up sending pad"); GST_DEBUG_OBJECT (element, "setting up sending pad");
/* sending pad */ /* sending pad */
srcpad = templ = gst_static_pad_template_get (template);
gst_pad_new_from_template (gst_static_pad_template_get (srctemplate), srcpad = gst_pad_new_from_template (templ, "src");
"src"); gst_object_unref (templ);
fail_if (srcpad == NULL, "Could not create a srcpad"); fail_if (srcpad == NULL, "Could not create a srcpad");
ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1); ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1);
@ -110,12 +111,14 @@ setup_sink_pad (GstElement * element, GstStaticPadTemplate * template,
GstCaps * caps) GstCaps * caps)
{ {
GstPad *srcpad, *sinkpad; GstPad *srcpad, *sinkpad;
GstPadTemplate *templ;
GST_DEBUG_OBJECT (element, "setting up receiving pad"); GST_DEBUG_OBJECT (element, "setting up receiving pad");
/* receiving pad */ /* receiving pad */
sinkpad = templ = gst_static_pad_template_get (template);
gst_pad_new_from_template (gst_static_pad_template_get (template), sinkpad = gst_pad_new_from_template (templ, "sink");
"sink"); gst_object_unref (templ);
fail_if (sinkpad == NULL, "Could not create a sinkpad"); fail_if (sinkpad == NULL, "Could not create a sinkpad");
srcpad = gst_element_get_pad (element, "src"); srcpad = gst_element_get_pad (element, "src");