From effd8920217923ef314f71fe90f41e005d2f92ef Mon Sep 17 00:00:00 2001 From: Vivia Nikolaidou Date: Wed, 13 Jun 2018 15:29:46 +0300 Subject: 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 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/gst-discoverer.c b/tools/gst-discoverer.c index 49e0aae0bb..c794324a6c 100644 --- a/tools/gst-discoverer.c +++ b/tools/gst-discoverer.c @@ -157,17 +157,23 @@ format_channel_mask (GstDiscovererAudioInfo * ainfo) 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); -- cgit v1.2.3-70-g09d2