morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

busctl: don't hit an assert if we call invalid bus method names

Browse Source 
We should validate this explicitly and generate a clear error string,
rather then hit an assert() later in the code.
This commit is contained in:
Lennart Poettering
2024-03-01 14:42:34 +01:00
parent 9c046d93fe
commit 5f76155e65
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/busctl/busctl.c
View File

@@ -2021,6 +2021,15 @@ static int call(int argc, char **argv, void *userdata) {
if (r < 0)
return r;
if (!service_name_is_valid(argv[1]))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid service name: %s", argv[1]);
if (!object_path_is_valid(argv[2]))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid object path: %s", argv[2]);
if (!interface_name_is_valid(argv[3]))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid interface name: %s", argv[3]);
if (!member_name_is_valid(argv[4]))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid member name: %s", argv[4]);
r = sd_bus_message_new_method_call(bus, &m, argv[1], argv[2], argv[3], argv[4]);
if (r < 0)
return bus_log_create_error(r);