commit b0876438b70f20467af85f61680b33dbe45e4ba2
author Vivia Nikolaidou <vivia@ahiru.eu> Wed Jun 13 15:29:46 2018 +0300
committer Tim-Philipp Müller <tim@centricular.com> Wed Jul 18 14:27:33 2018 +0100
tree 7adf3d487fc585588c2306d8a12360e082c47d87
parent 78689433be6c702d37978556a5449ebcfb993318

discoverer: Don't crash when running with -v if channel-mask==0 and >7 channels

For e.g. 16-channel audio, if the channel mask is 0 (which it usually
is), gst_audio_channel_positions_from_mask would get confused,
ultimately leading into a crash.

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

tools/gst-discoverer.c

diff --git a/tools/gst-discoverer.c b/tools/gst-discoverer.c
index 318297c..7d8c0a3 100644
--- a/tools/gst-discoverer.c
+++ b/tools/gst-discoverer.c
@@ -153,17 +153,23 @@
   guint channels = gst_discoverer_audio_info_get_channels (ainfo);
   GEnumClass *enum_class = g_type_class_ref (GST_TYPE_AUDIO_CHANNEL_POSITION);
   guint i;
+  guint64 channel_mask;
 
   if (channels == 0)
     goto done;
 
-  gst_audio_channel_positions_from_mask (channels,
-      gst_discoverer_audio_info_get_channel_mask (ainfo), position);
+  channel_mask = gst_discoverer_audio_info_get_channel_mask (ainfo);
 
-  for (i = 0; i < channels; i++) {
-    GEnumValue *value = g_enum_get_value (enum_class, position[i]);
-    my_g_string_append_printf (s, 0, "%s%s", value->value_nick,
-        i + 1 == channels ? "" : ", ");
+  if (channel_mask != 0) {
+    gst_audio_channel_positions_from_mask (channels, channel_mask, position);
+
+    for (i = 0; i < channels; i++) {
+      GEnumValue *value = g_enum_get_value (enum_class, position[i]);
+      my_g_string_append_printf (s, 0, "%s%s", value->value_nick,
+          i + 1 == channels ? "" : ", ");
+    }
+  } else {
+    g_string_append (s, "unknown layout");
   }
 
   g_type_class_unref (enum_class);