mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-11 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-reserve: require valid name + check rd_reserve_new errors

Browse source 
Empty name in rd_device_new triggers assert inside DBus, so bail out
before that.
This commit is contained in:
Pauli Virtanen 2023-11-27 19:20:31 +02:00 • committed by Wim Taymans
parent 422c270a74
commit b12119da28
3 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/tools/reserve.c
View file

@ -307,6 +307,34 @@ invalid:
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
bool rd_device_valid_device_name(const char *name)
{
const char *p = name;
if (!p || !*p)
return false;
/* cf. dbus-marshal-validate.c:_dbus_validate_bus_name_full */
while (*p) {
switch (*p) {
case 'A' ... 'Z':
case 'a' ... 'z':
case '-':
case '_':
break;
case '0' ... '9':
if (p == name)
return false;
break;
default:
return false;
}
++p;
}
return true;
}
struct rd_device *
rd_device_new(DBusConnection *connection, const char *device_name, const char *application_name,
int32_t priority, const struct rd_device_callbacks *callbacks, void *data)
@ -314,6 +342,11 @@ rd_device_new(DBusConnection *connection, const char *device_name, const char *a
struct rd_device *d;
int res;
if (!rd_device_valid_device_name(device_name)) {
errno = EINVAL;
return NULL;
}
d = calloc(1, sizeof(struct rd_device));
if (d == NULL)
return NULL;