mxf: do not assert on the values of data read from input
authorVincent Penquerc'h <vincent.penquerch@collabora.co.uk>
Tue, 9 Aug 2011 08:29:21 +0000 (09:29 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 9 Aug 2011 08:44:48 +0000 (10:44 +0200)
Instead, log a warning, and return.

https://bugzilla.gnome.org/show_bug.cgi?id=563827

gst/mxf/mxfmetadata.c

index b55bf0d..ca05ad7 100644 (file)
@@ -6379,9 +6379,13 @@ mxf_descriptive_metadata_new (guint8 scheme, guint32 type,
   _MXFDescriptiveMetadataScheme *s = NULL;
   MXFDescriptiveMetadata *ret = NULL;
 
-  g_return_val_if_fail (type != 0, NULL);
   g_return_val_if_fail (primer != NULL, NULL);
 
+  if (G_UNLIKELY (type == 0)) {
+    GST_WARNING ("Type 0 is invalid");
+    return NULL;
+  }
+
   for (i = 0; i < _dm_schemes->len; i++) {
     _MXFDescriptiveMetadataScheme *data =
         &g_array_index (_dm_schemes, _MXFDescriptiveMetadataScheme, i);