From 67c8b0dfbd4c6888c9a4bde315dfdf1379fd5461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 10 Jan 2012 12:02:56 +0100
Subject: [PATCH] audio: Don't crash if NULL positions are passed to
 gst_audio_info_set_format()

---
 gst-libs/gst/audio/audio.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c
index f0acfb5727..b6b06796a7 100644
--- a/gst-libs/gst/audio/audio.c
+++ b/gst-libs/gst/audio/audio.c
@@ -484,8 +484,10 @@ gst_audio_info_set_format (GstAudioInfo * info, GstAudioFormat format,
     info->position[1] = GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT;
     return;
   } else {
-    if (!check_valid_channel_positions (position, channels, TRUE, NULL)) {
-      g_warning ("Invalid channel positions");
+    if (!position
+        || !check_valid_channel_positions (position, channels, TRUE, NULL)) {
+      if (position)
+        g_warning ("Invalid channel positions");
     } else {
       memcpy (&info->position, position,
           info->channels * sizeof (info->position[0]));