mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: don't error on empty files

Browse source 
mmap of an empty file gives EINVAL. Avoid this and just don't update the
config.
This commit is contained in:
Wim Taymans 2022-08-08 16:03:11 +02:00
parent 04a3f51722
commit f8d26b96b4
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/pipewire/conf.c
View file

@ -405,12 +405,17 @@ static int conf_load(const char *path, struct pw_properties *conf)
if (fstat(fd, &sbuf) < 0) if (fstat(fd, &sbuf) < 0)
goto error_close; goto error_close;
if ((data = mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) == MAP_FAILED)
goto error_close;
close(fd);
count = pw_properties_update_string(conf, data, sbuf.st_size); if (sbuf.st_size > 0) {
munmap(data, sbuf.st_size); if ((data = mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) == MAP_FAILED)
goto error_close;
count = pw_properties_update_string(conf, data, sbuf.st_size);
munmap(data, sbuf.st_size);
} else {
count = 0;
}
close(fd);
pw_log_info("%p: loaded config '%s' with %d items", conf, path, count); pw_log_info("%p: loaded config '%s' with %d items", conf, path, count);