Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dbus.c: Handle invalid bus names #2763

Merged
merged 1 commit into from
May 22, 2019
Merged

dbus.c: Handle invalid bus names #2763

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions dbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,12 +660,13 @@ a_dbus_cleanup(void)
* \return The corresponding D-Bus connection.
*/
static DBusConnection *
a_dbus_bus_getbyname(const char *name)
a_dbus_bus_getbyname(lua_State *L, const char *name)
{
if(A_STREQ(name, "system"))
return dbus_connection_system;
if(A_STREQ(name, "session"))
return dbus_connection_session;
luaL_error(L, "Unknown dbus connection '%s', only 'system' and 'session' are valid", name);
return NULL;
}

Expand All @@ -681,7 +682,7 @@ luaA_dbus_request_name(lua_State *L)
{
const char *bus = luaL_checkstring(L, 1);
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));
return 1;
}
Expand All @@ -698,7 +699,7 @@ luaA_dbus_release_name(lua_State *L)
{
const char *bus = luaL_checkstring(L, 1);
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));
return 1;
}
Expand All @@ -714,7 +715,7 @@ luaA_dbus_add_match(lua_State *L)
{
const char *bus = luaL_checkstring(L, 1);
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)
{
Expand All @@ -737,7 +738,7 @@ luaA_dbus_remove_match(lua_State *L)
{
const char *bus = luaL_checkstring(L, 1);
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)
{
Expand Down Expand Up @@ -811,7 +812,7 @@ luaA_dbus_emit_signal(lua_State *L)
const char *path = luaL_checkstring(L, 2);
const char *itface = luaL_checkstring(L, 3);
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);
if (msg == NULL) {
luaA_warn(L, "your D-Bus signal emitting method error'd");
Expand Down