From: Edward Hervey <edward@centricular.com>
Date: Tue, 27 Jun 2017 09:48:08 +0000 (+0200)
Subject: asfdemux: More index handling
X-Git-Tag: 1.12.2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86422147335662a7217942e8dac79729d2789420;p=platform%2Fupstream%2Fgst-plugins-ugly.git

asfdemux: More index handling

In the same vein as the previous commit, the end of the file might have been
cut and therefore contains bogus data.

If the object is too short, consider it as garbage and return a non-fatal
flow.

Regression introduced in 97294eb8bbed1b9dad7d3f2c52dd69eb1812cc06
---

diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index ff063a7b..d81ad167 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -1124,13 +1124,21 @@ gst_asf_demux_pull_indices (GstASFDemux * demux)
     gst_buffer_unmap (buf, &map);
     gst_buffer_replace (&buf, NULL);
 
+    if (ret == ASF_FLOW_NEED_MORE_DATA) {
+      /* Since indices are at the end of the file, if we need more data,
+       * we consider it as a non-fatal corrupted index */
+      ret = GST_FLOW_OK;
+      break;
+    }
+
     if (G_UNLIKELY (ret != GST_FLOW_OK))
       break;
 
     ++num_read;
   }
 
-  GST_DEBUG_OBJECT (demux, "read %u index objects", num_read);
+  GST_DEBUG_OBJECT (demux, "read %u index objects , returning %s", num_read,
+      gst_flow_get_name (ret));
   return ret;
 }