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

gst/asfdemux/gstasfdemux.c: Prevent infinite loops. More correct error reporting.

Browse source 
Original commit message from CVS:
* gst/asfdemux/gstasfdemux.c: (_read_var_length), (_read_guid),
(gst_asf_demux_process_segment), (gst_asf_demux_handle_data),
(gst_asf_demux_process_chunk), (gst_asf_demux_handle_sink_event):
Prevent infinite loops. More correct error reporting.
* gst/auparse/gstauparse.c: (gst_auparse_chain):
Error out if negotiation fails.
* gst/playback/gstplaybasebin.c: (setup_source),
(gst_play_base_bin_change_state), (gst_play_base_bin_error),
(gst_play_base_bin_found_tag):
Error/tag forwarding. Pre-roll fixes for source errors on state
changes (e.g. "file does not exist") to prevent hangs.
This commit is contained in:
Ronald S. Bultje 2004-09-22 07:55:36 +00:00
parent adf306b7fa
commit a440de35e7
2 changed files with 39 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2004-09-22 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/asfdemux/gstasfdemux.c: (_read_var_length), (_read_guid),
(gst_asf_demux_process_segment), (gst_asf_demux_handle_data),
(gst_asf_demux_process_chunk), (gst_asf_demux_handle_sink_event):
Prevent infinite loops. More correct error reporting.
* gst/auparse/gstauparse.c: (gst_auparse_chain):
Error out if negotiation fails.
* gst/playback/gstplaybasebin.c: (setup_source),
(gst_play_base_bin_change_state), (gst_play_base_bin_error),
(gst_play_base_bin_found_tag):
Error/tag forwarding. Pre-roll fixes for source errors on state
changes (e.g. "file does not exist") to prevent hangs.
2004-09-21 Zaheer Abbas Merali <zaheerabbas at merali dot org> 2004-09-21 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* testsuite/multifilesink/Makefile.am: * testsuite/multifilesink/Makefile.am:

35
gst/asfdemux/gstasfdemux.c
View file

@ -286,15 +286,17 @@ _read_var_length (GstASFDemux * asf_demux, guint8 type, guint32 * rsize)
got_bytes = gst_bytestream_peek_bytes (bs, &var, 4); got_bytes = gst_bytestream_peek_bytes (bs, &var, 4);
while (got_bytes < 4) { do {
guint32 remaining; guint32 remaining;
GstEvent *event; GstEvent *event;
if ((got_bytes = gst_bytestream_peek_bytes (bs, &var, 4)) == 4)
break;
gst_bytestream_get_status (bs, &remaining, &event); gst_bytestream_get_status (bs, &remaining, &event);
gst_event_unref (event);
got_bytes = gst_bytestream_peek_bytes (bs, &var, 4); if (!gst_asf_demux_handle_sink_event (asf_demux, event, remaining))
} return FALSE;
} while (1);
switch (type) { switch (type) {
case 1: case 1:
@ -340,12 +342,13 @@ _read_uint ## bits (GstASFDemux *asf_demux, guint ## bits *ret) \
} }
#define GST_READ_UINT8_LE(x) GST_READ_UINT8(x) #define GST_READ_UINT8_LE(x) GST_READ_UINT8(x)
READ_UINT_BITS_FUNCTION (8) READ_UINT_BITS_FUNCTION (8);
READ_UINT_BITS_FUNCTION (16) READ_UINT_BITS_FUNCTION (16);
READ_UINT_BITS_FUNCTION (32) READ_UINT_BITS_FUNCTION (32);
READ_UINT_BITS_FUNCTION (64) READ_UINT_BITS_FUNCTION (64);
#define GET_UINT(a,b)
static gboolean _read_guid (GstASFDemux * asf_demux, ASFGuid * guid) static gboolean
_read_guid (GstASFDemux * asf_demux, ASFGuid * guid)
{ {
return (_read_uint32 (asf_demux, &guid->v1) && return (_read_uint32 (asf_demux, &guid->v1) &&
_read_uint32 (asf_demux, &guid->v2) && _read_uint32 (asf_demux, &guid->v2) &&
@ -764,7 +767,14 @@ gst_asf_demux_process_segment (GstASFDemux * asf_demux,
if (!gst_asf_demux_process_chunk (asf_demux, packet_info, &segment_info)) if (!gst_asf_demux_process_chunk (asf_demux, packet_info, &segment_info))
return FALSE; return FALSE;
if (segment_info.chunk_size < frag_size)
frag_size -= segment_info.chunk_size + 1; frag_size -= segment_info.chunk_size + 1;
else {
GST_ELEMENT_ERROR (asf_demux, STREAM, TOO_LAZY,
("Invalid data in stream"),
("Invalid fragment size indicator in segment"));
return FALSE;
}
} }
} else { } else {
segment_info.chunk_size = frag_size; segment_info.chunk_size = frag_size;
@ -917,7 +927,6 @@ gst_asf_demux_handle_data (GstASFDemux * asf_demux)
if (!gst_asf_demux_process_segment (asf_demux, &packet_info)) if (!gst_asf_demux_process_segment (asf_demux, &packet_info))
return FALSE; return FALSE;
} }
/* Skip the padding */ /* Skip the padding */
if (packet_info.padsize > 0) if (packet_info.padsize > 0)
gst_bytestream_flush (asf_demux->bs, packet_info.padsize); gst_bytestream_flush (asf_demux->bs, packet_info.padsize);
@ -1291,6 +1300,9 @@ gst_asf_demux_process_chunk (GstASFDemux * asf_demux,
} }
gst_pad_push (stream->pad, GST_DATA (stream->payload)); gst_pad_push (stream->pad, GST_DATA (stream->payload));
} else {
gst_buffer_unref (stream->payload);
stream->payload = NULL;
} }
stream->frag_offset = 0; stream->frag_offset = 0;
@ -1349,6 +1361,7 @@ gst_asf_demux_handle_sink_event (GstASFDemux * asf_demux,
default: default:
GST_WARNING_OBJECT (asf_demux, "unhandled event %d", GST_WARNING_OBJECT (asf_demux, "unhandled event %d",
GST_EVENT_TYPE (event)); GST_EVENT_TYPE (event));
ret = FALSE;
break; break;
} }