gst/mxf/mxfdemux.c: Actually we support a length stored inside 8 bytes but it must be smaller than G_MAXUINT for GstB...

Original commit message from CVS:
* gst/mxf/mxfdemux.c: (gst_mxf_demux_pull_klv_packet),
(gst_mxf_demux_chain):
Actually we support a length stored inside 8 bytes but it must
be smaller than G_MAXUINT for GstBuffer.

2 files changed, 32 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index ac58510e..f942a5b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-11-23  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
+	* gst/mxf/mxfdemux.c: (gst_mxf_demux_pull_klv_packet),
+	(gst_mxf_demux_chain):
+	Actually we support a length stored inside 8 bytes but it must
+	be smaller than G_MAXUINT for GstBuffer.
+
+2008-11-23  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
 	Patch by: Tal Shalif <tshalif at nargila dot org>
 
 	* ext/resindvd/resindvdsrc.c:
diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c
index 8a897920..2fdfcb18 100644
--- a/gst/mxf/mxfdemux.c
+++ b/gst/mxf/mxfdemux.c
@@ -1127,9 +1127,8 @@ gst_mxf_demux_handle_header_metadata_resolve_references (GstMXFDemux * demux)
           MXFMetadataEssenceContainerData, i);
 
       for (j = 0; j < demux->content_storage.n_essence_container_data; j++) {
-        if (mxf_ul_is_equal (&demux->
-                content_storage.essence_container_data_uids[j],
-                &data->instance_uid)) {
+        if (mxf_ul_is_equal (&demux->content_storage.
+                essence_container_data_uids[j], &data->instance_uid)) {
           demux->content_storage.essence_container_data[j] = data;
           break;
         }
@@ -1982,7 +1981,7 @@ gst_mxf_demux_pull_klv_packet (GstMXFDemux * demux, guint64 offset, MXFUL * key,
   GstBuffer *buffer = NULL;
   const guint8 *data;
   guint64 data_offset = 0;
-  guint length;
+  guint64 length;
   gchar key_str[48];
   GstFlowReturn ret = GST_FLOW_OK;
 
@@ -2014,17 +2013,13 @@ gst_mxf_demux_pull_klv_packet (GstMXFDemux * demux, guint64 offset, MXFUL * key,
     data_offset = 16 + 1 + slen;
 
     gst_buffer_unref (buffer);
+    buffer = NULL;
 
-    /* Must be at most 8 according to SMPTE-379M 5.3.4 and
-     * GStreamer buffers can only have a 4 bytes length */
+    /* Must be at most 8 according to SMPTE-379M 5.3.4 */
     if (slen > 8) {
       GST_ERROR_OBJECT (demux, "Invalid KLV packet length: %u", slen);
       ret = GST_FLOW_ERROR;
       goto beach;
-    } else if (slen > 4) {
-      GST_ERROR_OBJECT (demux, "Unsupported KLV packet length: %u", slen);
-      ret = GST_FLOW_ERROR;
-      goto beach;
     }
 
     /* Now pull the length of the packet */
@@ -2042,6 +2037,16 @@ gst_mxf_demux_pull_klv_packet (GstMXFDemux * demux, guint64 offset, MXFUL * key,
   }
 
   gst_buffer_unref (buffer);
+  buffer = NULL;
+
+  /* GStreamer's buffer sizes are stored in a guint so we
+   * limit ourself to G_MAXUINT large buffers */
+  if (length > G_MAXUINT) {
+    GST_ERROR_OBJECT (demux,
+        "Unsupported KLV packet length: %" G_GUINT64_FORMAT, length);
+    ret = GST_FLOW_ERROR;
+    goto beach;
+  }
 
   /* Pull the complete KLV packet */
   if ((ret = gst_mxf_demux_pull_range (demux, offset + data_offset, length,
@@ -2406,7 +2411,7 @@ gst_mxf_demux_chain (GstPad * pad, GstBuffer * inbuf)
   GstMXFDemux *demux = NULL;
   MXFUL key;
   const guint8 *data = NULL;
-  guint length = 0;
+  guint64 length = 0;
   guint64 offset = 0;
   GstBuffer *buffer = NULL;
   gchar key_str[48];
@@ -2507,10 +2512,6 @@ gst_mxf_demux_chain (GstPad * pad, GstBuffer * inbuf)
         GST_ERROR_OBJECT (demux, "Invalid KLV packet length: %u", slen);
         ret = GST_FLOW_ERROR;
         break;
-      } else if (slen > 4) {
-        GST_ERROR_OBJECT (demux, "Unsupported KLV packet length: %u", slen);
-        ret = GST_FLOW_ERROR;
-        break;
       }
 
       if (gst_adapter_available (demux->adapter) < 17 + slen)
@@ -2527,6 +2528,15 @@ gst_mxf_demux_chain (GstPad * pad, GstBuffer * inbuf)
       }
     }
 
+    /* GStreamer's buffer sizes are stored in a guint so we
+     * limit ourself to G_MAXUINT large buffers */
+    if (length > G_MAXUINT) {
+      GST_ERROR_OBJECT (demux,
+          "Unsupported KLV packet length: %" G_GUINT64_FORMAT, length);
+      ret = GST_FLOW_ERROR;
+      break;
+    }
+
     if (gst_adapter_available (demux->adapter) < offset + length)
       break;