From 7beb85abb79ec99ecfa3a53d326dbd7442eb51d3 Mon Sep 17 00:00:00 2001 From: David Reveman Date: Fri, 5 Sep 2008 03:34:30 +0200 Subject: [PATCH] Don't allow empty string for screen name. --- hw/dmx/dmxdbus.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/hw/dmx/dmxdbus.c b/hw/dmx/dmxdbus.c index bb43cda26..e9a3f97fd 100644 --- a/hw/dmx/dmxdbus.c +++ b/hw/dmx/dmxdbus.c @@ -78,9 +78,17 @@ attach_screen (DBusMessage *message, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &auth_data, &auth_data_len, DBUS_TYPE_INVALID)) - { - DebugF (MALFORMED_MSG ": %s, %s", error->name, error->message); - return BadValue; + { + DebugF (MALFORMED_MSG ": %s, %s", error->name, error->message); + return BadValue; + } + + if (!*name) + { + dbus_set_error (error, + DBUS_ERROR_FAILED, + "Cannot use empty string for screen name"); + return BadValue; } if (screen >= dmxGetNumScreens ())