mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: check for valid config name

Browse source 
It needs to be "null" or ending in .conf
This commit is contained in:
Wim Taymans 2023-08-02 11:05:00 +02:00
parent 71262da6d7
commit c28a148c26
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pipewire/conf.c
View file

@ -984,6 +984,11 @@ int pw_conf_section_update_props(const struct spa_dict *conf,
return res == 0 ? data.count : res; return res == 0 ? data.count : res;
} }
static bool valid_conf_name(const char *str)
{
return spa_streq(str, "null") || spa_strendswith(str, ".conf");
}
static int try_load_conf(const char *conf_prefix, const char *conf_name, static int try_load_conf(const char *conf_prefix, const char *conf_name,
struct pw_properties *conf) struct pw_properties *conf)
{ {
@ -1018,6 +1023,11 @@ int pw_conf_load_conf_for_context(struct pw_properties *props, struct pw_propert
conf_name = pw_properties_get(props, PW_KEY_CONFIG_NAME); conf_name = pw_properties_get(props, PW_KEY_CONFIG_NAME);
if (conf_name == NULL) if (conf_name == NULL)
conf_name = "client.conf"; conf_name = "client.conf";
else if (!valid_conf_name(conf_name)) {
pw_log_error("%s '%s' does not end with .conf",
PW_KEY_CONFIG_NAME, conf_name);
return -EINVAL;
}
if ((res = try_load_conf(conf_prefix, conf_name, conf)) < 0) { if ((res = try_load_conf(conf_prefix, conf_name, conf)) < 0) {
pw_log_error("can't load config %s: %s", pw_log_error("can't load config %s: %s",
conf_name, spa_strerror(res)); conf_name, spa_strerror(res));
@ -1030,6 +1040,12 @@ int pw_conf_load_conf_for_context(struct pw_properties *props, struct pw_propert
struct pw_properties *override; struct pw_properties *override;
const char *path, *name; const char *path, *name;
if (!valid_conf_name(conf_name)) {
pw_log_error("%s '%s' does not end with .conf",
PW_KEY_CONFIG_OVERRIDE_NAME, conf_name);
return -EINVAL;
}
override = pw_properties_new(NULL, NULL); override = pw_properties_new(NULL, NULL);
if (override == NULL) { if (override == NULL) {
res = -errno; res = -errno;