mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 23:28:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

flvmux: plug leak(s) in error-scenario

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=762210
This commit is contained in:
Havard Graff 2015-12-04 00:46:34 +11:00 committed by Tim-Philipp Müller
parent 1e09e5bfe9
commit 7787f439fc
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst/flv/gstflvmux.c
View file

@ -1317,21 +1317,35 @@ gst_flv_mux_write_header (GstFlvMux * mux)
/* push the header buffer, the metadata and the codec info, if any */ /* push the header buffer, the metadata and the codec info, if any */
ret = gst_flv_mux_push (mux, header); ret = gst_flv_mux_push (mux, header);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
return ret; goto failure_header;
ret = gst_flv_mux_push (mux, metadata); ret = gst_flv_mux_push (mux, metadata);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
return ret; goto failure_metadata;
if (video_codec_data != NULL) { if (video_codec_data != NULL) {
ret = gst_flv_mux_push (mux, video_codec_data); ret = gst_flv_mux_push (mux, video_codec_data);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
return ret; goto failure_video_codec_data;
} }
if (audio_codec_data != NULL) { if (audio_codec_data != NULL) {
ret = gst_flv_mux_push (mux, audio_codec_data); ret = gst_flv_mux_push (mux, audio_codec_data);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
return ret; goto failure_audio_codec_data;
} }
return GST_FLOW_OK; return GST_FLOW_OK;
failure_header:
gst_buffer_unref (metadata);
failure_metadata:
if (video_codec_data != NULL)
gst_buffer_unref (video_codec_data);
failure_video_codec_data:
if (audio_codec_data != NULL)
gst_buffer_unref (audio_codec_data);
failure_audio_codec_data:
return ret;
} }
static void static void
@ -1581,8 +1595,10 @@ gst_flv_mux_handle_buffer (GstCollectPads * pads, GstCollectData * cdata,
} }
ret = gst_flv_mux_write_header (mux); ret = gst_flv_mux_write_header (mux);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK) {
gst_buffer_unref (buffer);
return ret; return ret;
}
mux->state = GST_FLV_MUX_STATE_DATA; mux->state = GST_FLV_MUX_STATE_DATA;
if (GST_COLLECT_PADS_DTS_IS_VALID (cdata)) if (GST_COLLECT_PADS_DTS_IS_VALID (cdata))