mirror of
https://gitlab.freedesktop.org/pipewire/pipewire
synced 2024-10-14 20:02:38 +00:00
conf: don't allow a NULL config name
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:
parent
fb2d35895e
commit
bba9edabee
|
@ -254,6 +254,11 @@ static int conf_load(const char *prefix, const char *name, struct pw_properties
|
||||||
struct stat sbuf;
|
struct stat sbuf;
|
||||||
int fd;
|
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) {
|
if (get_read_path(path, sizeof(path), prefix, name) == 0) {
|
||||||
pw_log_debug(NAME" %p: can't load config '%s': %m", conf, path);
|
pw_log_debug(NAME" %p: can't load config '%s': %m", conf, path);
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
|
@ -75,9 +75,24 @@ PWTEST(config_load_abspath)
|
||||||
return PWTEST_PASS;
|
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;
|
return PWTEST_PASS;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue