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

support absolute paths

Browse source
This commit is contained in:
Wim Taymans 2019-12-06 17:54:05 +01:00
parent 9610a4a573
commit c990c73d62
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/module-protocol-native.c
View file

@ -404,19 +404,31 @@ static int init_socket_name(struct server *s, const char *name)
{ {
int name_size; int name_size;
const char *runtime_dir; const char *runtime_dir;
bool path_is_absolute;
if ((runtime_dir = getenv("XDG_RUNTIME_DIR")) == NULL) { path_is_absolute = name[0] == '/';
runtime_dir = getenv("XDG_RUNTIME_DIR");
if (runtime_dir == NULL && !path_is_absolute) {
pw_log_error("server %p: XDG_RUNTIME_DIR not set in the environment", s); pw_log_error("server %p: XDG_RUNTIME_DIR not set in the environment", s);
return -EIO; return -ENOENT;
} }
s->addr.sun_family = AF_LOCAL; s->addr.sun_family = AF_LOCAL;
name_size = snprintf(s->addr.sun_path, sizeof(s->addr.sun_path), if (path_is_absolute)
name_size = snprintf(s->addr.sun_path, sizeof(s->addr.sun_path),
"%s", name) + 1;
else
name_size = snprintf(s->addr.sun_path, sizeof(s->addr.sun_path),
"%s/%s", runtime_dir, name) + 1; "%s/%s", runtime_dir, name) + 1;
if (name_size > (int) sizeof(s->addr.sun_path)) { if (name_size > (int) sizeof(s->addr.sun_path)) {
pw_log_error("server %p: socket path \"%s/%s\" plus null terminator exceeds 108 bytes", if (path_is_absolute)
s, runtime_dir, name); pw_log_error("server %p: socket path \"%s\" plus null terminator exceeds %i bytes",
s, name, (int) sizeof(s->addr.sun_path));
else
pw_log_error("server %p: socket path \"%s/%s\" plus null terminator exceeds %i bytes",
s, runtime_dir, name, (int) sizeof(s->addr.sun_path));
*s->addr.sun_path = 0; *s->addr.sun_path = 0;
return -ENAMETOOLONG; return -ENAMETOOLONG;
} }