[vlc-commits] dbus: Oops, abandon the correct container on error paths

[Mirsal Ennaime]

vlc | branch: master | Mirsal Ennaime <mirsal at videolan.org> | Thu Feb  7 04:18:12 2013 +0100| [cdc85689a17f8b81cf437c29b1d298cf5f571bac] | committer: Mirsal Ennaime

dbus: Oops, abandon the correct container on error paths

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cdc85689a17f8b81cf437c29b1d298cf5f571bac
---

 modules/control/dbus/dbus_player.c |    2 +-
 modules/control/dbus/dbus_root.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/control/dbus/dbus_player.c b/modules/control/dbus/dbus_player.c
index 010cd3b..88fc7e9 100644
--- a/modules/control/dbus/dbus_player.c
+++ b/modules/control/dbus/dbus_player.c
@@ -857,7 +857,7 @@ PropertiesChangedSignal( intf_thread_t    *p_intf,
 
     if( unlikely(!ppsz_properties) )
     {
-        dbus_message_iter_abandon_container( &args, &invalidated_properties );
+        dbus_message_iter_abandon_container( &args, &changed_properties );
         return DBUS_HANDLER_RESULT_NEED_MEMORY;
     }
 
diff --git a/modules/control/dbus/dbus_root.c b/modules/control/dbus/dbus_root.c
index 358bc8a..7702034 100644
--- a/modules/control/dbus/dbus_root.c
+++ b/modules/control/dbus/dbus_root.c
@@ -483,7 +483,7 @@ PropertiesChangedSignal( intf_thread_t    *p_intf,
 
     if( unlikely(!ppsz_properties) )
     {
-        dbus_message_iter_abandon_container( &args, &invalidated_properties );
+        dbus_message_iter_abandon_container( &args, &changed_properties );
         return DBUS_HANDLER_RESULT_NEED_MEMORY;
     }