From 0bbdfa8ee9e969cba8f685842c1b78dcfa2da166 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 27 Jun 2017 10:25:42 +0200 Subject: [PATCH] asfdemux; Don't assume index is present at end of file Some files have garbage at the end of the file, don't error out if we don't find the index there. Reverts back to previous behaviour (where corrupted/missing indexex were not a fatal error). Regression introduced in 97294eb8bbed1b9dad7d3f2c52dd69eb1812cc06 --- gst/asfdemux/gstasfdemux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index c7fa0d42..89404dd8 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -1090,9 +1090,12 @@ gst_asf_demux_pull_indices (GstASFDemux * demux) gst_buffer_map (buf, &map, GST_MAP_READ); g_assert (map.size >= 16 + 8); if (!asf_demux_peek_object (demux, map.data, 16 + 8, &obj, TRUE)) { + GST_DEBUG_OBJECT (demux, "No valid object, corrupted index, ignoring"); + GST_MEMDUMP_OBJECT (demux, "Corrupted index ?", map.data, MIN (map.size, + 64)); gst_buffer_unmap (buf, &map); gst_buffer_replace (&buf, NULL); - ret = GST_FLOW_ERROR; + /* Non-fatal, return */ break; } gst_buffer_unmap (buf, &map); -- 2.34.1