[vlc-commits] dbus: Fix handling of input events and remove memleaks

[Mirsal Ennaime]

vlc/vlc-2.0 | branch: master | Mirsal Ennaime <mirsal at videolan.org> | Sun Mar 10 03:54:55 2013 +0100| [36108d2636cb237865bb43313b384b4f62750776] | committer: Jean-Baptiste Kempf

dbus: Fix handling of input events and remove memleaks

Correctly handle the INPUT_EVENT_ITEM_META and INPUT_EVENT_ITEM_META
instead of skipping the whole event processing code without even freeing
the callback_info_t data structure.

Closes: #8285
(cherry picked from commit 01b2d9f038211e91fd2348858d58931f0a48faa1)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/control/dbus/dbus.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index 844161d..4958f98 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -904,10 +904,10 @@ static int InputIntfEventCallback( intf_thread_t   *p_intf,
             break;
         case INPUT_EVENT_ITEM_META:
             p_info->signal = SIGNAL_INPUT_METADATA;
-            return VLC_SUCCESS;
+            break;
         case INPUT_EVENT_RATE:
             p_info->signal = SIGNAL_RATE;
-            return VLC_SUCCESS;
+            break;
         case INPUT_EVENT_POSITION:
             /* Detect seeks
              * XXX: This is way more convoluted than it should be... */