From b1bb9b54365a42e8d1b801378b51aa38789fbd84 Mon Sep 17 00:00:00 2001
From: Mirsal Ennaime <mirsal@videolan.org>
Date: Thu, 7 Feb 2013 03:54:11 +0100
Subject: [PATCH] dbus: Add another memory allocation failure check

---
 modules/control/dbus/dbus_player.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/control/dbus/dbus_player.c b/modules/control/dbus/dbus_player.c
index 7ec4e9ddff..010cd3b5f3 100644
--- a/modules/control/dbus/dbus_player.c
+++ b/modules/control/dbus/dbus_player.c
@@ -855,6 +855,12 @@ PropertiesChangedSignal( intf_thread_t    *p_intf,
     i_properties = vlc_dictionary_keys_count( p_changed_properties );
     ppsz_properties = vlc_dictionary_all_keys( p_changed_properties );
 
+    if( unlikely(!ppsz_properties) )
+    {
+        dbus_message_iter_abandon_container( &args, &invalidated_properties );
+        return DBUS_HANDLER_RESULT_NEED_MEMORY;
+    }
+
     for( int i = 0; i < i_properties; i++ )
     {
         PROPERTY_MAPPING_BEGIN