[vlc-commits] dbus: Do not crash on method calls with a null interface

Mirsal Ennaime git at videolan.org
Sun Feb 26 18:16:58 CET 2012


vlc/vlc-2.0 | branch: master | Mirsal Ennaime <mirsal at videolan.org> | Sun Feb 26 17:38:09 2012 +0100| [34519a21110a3d31a862c374098b4db0fc095269] | committer: Jean-Baptiste Kempf

dbus: Do not crash on method calls with a null interface
(cherry picked from commit 735e0dac1990eb9ba7f1882ee2d0ad40739e1d68)

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

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

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

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index 59f528e..57df944 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -779,7 +779,7 @@ MPRISEntryPoint ( DBusConnection *p_conn, DBusMessage *p_from, void *p_this )
 
     DBusError error;
 
-    if( strcmp( psz_interface, DBUS_INTERFACE_PROPERTIES ) )
+    if( psz_interface && strcmp( psz_interface, DBUS_INTERFACE_PROPERTIES ) )
         psz_target_interface = psz_interface;
 
     else



More information about the vlc-commits mailing list