diff options
Diffstat (limited to 'gst/id3demux')
| -rw-r--r-- | gst/id3demux/gstid3demux.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/gst/id3demux/gstid3demux.c b/gst/id3demux/gstid3demux.c index b498639f..5f51a6a2 100644 --- a/gst/id3demux/gstid3demux.c +++ b/gst/id3demux/gstid3demux.c @@ -305,6 +305,10 @@ gst_id3demux_remove_srcpad (GstID3Demux * id3demux) return res; }; +/* will return FALSE if buffer is beyond end of data; will return TRUE + * if buffer was trimmed successfully or didn't need trimming, but may + * also return TRUE and set *buf_ref to NULL if the buffer was before + * the start of the data */ static gboolean gst_id3demux_trim_buffer (GstID3Demux * id3demux, GstBuffer ** buf_ref) { @@ -328,7 +332,7 @@ gst_id3demux_trim_buffer (GstID3Demux * id3demux, GstBuffer ** buf_ref) if (out_offset >= v1tag_offset) { GST_DEBUG_OBJECT (id3demux, "Buffer is past the end of the data"); - goto no_out_buffer; + goto no_out_buffer_end; } if (out_offset + out_size > v1tag_offset) { @@ -343,7 +347,7 @@ gst_id3demux_trim_buffer (GstID3Demux * id3demux, GstBuffer ** buf_ref) if (out_offset <= id3demux->strip_start) { if (out_offset + out_size <= id3demux->strip_start) { GST_DEBUG_OBJECT (id3demux, "Buffer is before the start of the data"); - goto no_out_buffer; + goto no_out_buffer_start; } trim_start = id3demux->strip_start - out_offset; @@ -381,10 +385,19 @@ gst_id3demux_trim_buffer (GstID3Demux * id3demux, GstBuffer ** buf_ref) } return TRUE; -no_out_buffer: - gst_buffer_unref (buf); - *buf_ref = NULL; - return FALSE; + +no_out_buffer_end: + { + gst_buffer_unref (buf); + *buf_ref = NULL; + return FALSE; + } +no_out_buffer_start: + { + gst_buffer_unref (buf); + *buf_ref = NULL; + return TRUE; + } } static GstFlowReturn @@ -945,6 +958,9 @@ gst_id3demux_read_range (GstID3Demux * id3demux, if (ret == GST_FLOW_OK && *buffer) { if (!gst_id3demux_trim_buffer (id3demux, buffer)) goto read_beyond_end; + + /* this should only happen in streaming mode */ + g_assert (*buffer != NULL); } return ret; |