Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dbus.c: Handle invalid bus names 

This makes the following code produce a Lua error instead of crashing
AwesomeWM:

  dbus.emit_signal("foobar", "/", "org.awesome.SomeInterface", "method",
      "s", "string argument")

The crash looked like this:

  dbus[710]: arguments to dbus_connection_send() were incorrect, assertion
      "connection != NULL" failed in file dbus/dbus-connection.c line 3307.
  This is normally a bug in some application using the D-Bus library.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2019-05-05 12:48:34 +02:00
parent f03d5474cb
commit ab7ac2e12a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dbus.c
View File

@ -660,12 +660,13 @@ a_dbus_cleanup(void)
* \return The corresponding D-Bus connection. * \return The corresponding D-Bus connection.
*/ */
static DBusConnection * static DBusConnection *
a_dbus_bus_getbyname(const char *name) a_dbus_bus_getbyname(lua_State *L, const char *name)
{ {
if(A_STREQ(name, "system")) if(A_STREQ(name, "system"))
return dbus_connection_system; return dbus_connection_system;
if(A_STREQ(name, "session")) if(A_STREQ(name, "session"))
return dbus_connection_session; return dbus_connection_session;
luaL_error(L, "Unknown dbus connection '%s', only 'system' and 'session' are valid", name);
return NULL; return NULL;
} }
@ -681,7 +682,7 @@ luaA_dbus_request_name(lua_State *L)
{ {
const char *bus = luaL_checkstring(L, 1); const char *bus = luaL_checkstring(L, 1);
const char *name = luaL_checkstring(L, 2); const char *name = luaL_checkstring(L, 2);
DBusConnection *dbus_connection = a_dbus_bus_getbyname(bus); DBusConnection *dbus_connection = a_dbus_bus_getbyname(L, bus);
lua_pushboolean(L, a_dbus_request_name(dbus_connection, name)); lua_pushboolean(L, a_dbus_request_name(dbus_connection, name));
return 1; return 1;
} }
@ -698,7 +699,7 @@ luaA_dbus_release_name(lua_State *L)
{ {
const char *bus = luaL_checkstring(L, 1); const char *bus = luaL_checkstring(L, 1);
const char *name = luaL_checkstring(L, 2); const char *name = luaL_checkstring(L, 2);
DBusConnection *dbus_connection = a_dbus_bus_getbyname(bus); DBusConnection *dbus_connection = a_dbus_bus_getbyname(L, bus);
lua_pushboolean(L, a_dbus_release_name(dbus_connection, name)); lua_pushboolean(L, a_dbus_release_name(dbus_connection, name));
return 1; return 1;
} }
@ -714,7 +715,7 @@ luaA_dbus_add_match(lua_State *L)
{ {
const char *bus = luaL_checkstring(L, 1); const char *bus = luaL_checkstring(L, 1);
const char *name = luaL_checkstring(L, 2); const char *name = luaL_checkstring(L, 2);
DBusConnection *dbus_connection = a_dbus_bus_getbyname(bus); DBusConnection *dbus_connection = a_dbus_bus_getbyname(L, bus);
if(dbus_connection) if(dbus_connection)
{ {
@ -737,7 +738,7 @@ luaA_dbus_remove_match(lua_State *L)
{ {
const char *bus = luaL_checkstring(L, 1); const char *bus = luaL_checkstring(L, 1);
const char *name = luaL_checkstring(L, 2); const char *name = luaL_checkstring(L, 2);
DBusConnection *dbus_connection = a_dbus_bus_getbyname(bus); DBusConnection *dbus_connection = a_dbus_bus_getbyname(L, bus);
if(dbus_connection) if(dbus_connection)
{ {
@ -811,7 +812,7 @@ luaA_dbus_emit_signal(lua_State *L)
const char *path = luaL_checkstring(L, 2); const char *path = luaL_checkstring(L, 2);
const char *itface = luaL_checkstring(L, 3); const char *itface = luaL_checkstring(L, 3);
const char *name = luaL_checkstring(L, 4); const char *name = luaL_checkstring(L, 4);
DBusConnection *dbus_connection = a_dbus_bus_getbyname(bus_name); DBusConnection *dbus_connection = a_dbus_bus_getbyname(L, bus_name);
DBusMessage* msg = dbus_message_new_signal(path, itface, name); DBusMessage* msg = dbus_message_new_signal(path, itface, name);
if (msg == NULL) { if (msg == NULL) {
luaA_warn(L, "your D-Bus signal emitting method error'd"); luaA_warn(L, "your D-Bus signal emitting method error'd");