system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-07-21 02:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

conf: don't allow a NULL config name

Browse source 
No functional changes, this is enforced by the only in-tree callers of
pw_conf_load_conf() but let's enforce this properly.
This commit is contained in:
Peter Hutterer 2021-07-06 12:00:34 +10:00 committed by Wim Taymans
parent fb2d35895e
commit bba9edabee
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/pipewire/conf.c
View file

@ -254,6 +254,11 @@ static int conf_load(const char *prefix, const char *name, struct pw_properties
struct stat sbuf;
int fd;
if (name == NULL) {
pw_log_debug(NAME" %p: config name must not be NULL", conf);
return -EINVAL;
}
if (get_read_path(path, sizeof(path), prefix, name) == 0) {
pw_log_debug(NAME" %p: can't load config '%s': %m", conf, path);
return -ENOENT;

19
test/test-config.c
View file

@ -75,9 +75,24 @@ PWTEST(config_load_abspath)
return PWTEST_PASS;
}
PWTEST_SUITE(context)
PWTEST(config_load_nullname)
{
pwtest_add(config_load_abspath, PWTEST_NOARG);
struct pw_properties *props = pw_properties_new("ignore", "me", NULL);
int r;
r = pw_conf_load_conf(NULL, NULL, props);
pwtest_neg_errno(r, -EINVAL);
r = pw_conf_load_conf("/dummy", NULL, props);
pwtest_neg_errno(r, -EINVAL);
return PWTEST_PASS;
}
PWTEST_SUITE(context)
{
pwtest_add(config_load_abspath, PWTEST_NOARG);
pwtest_add(config_load_nullname, PWTEST_NOARG);
return PWTEST_PASS;
}