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

pulse-server: don't append "/pulse" to PULSE_RUNTIME_PATH

Browse source 
Fixes #2431
This commit is contained in:
Wim Taymans 2022-06-09 17:06:07 +02:00
parent 31bf631057
commit 4821c7ca2f
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/module-protocol-pulse/server.c
View file

@ -460,7 +460,7 @@ static int parse_unix_address(const char *address, struct sockaddr_storage *addr
if (address[0] != '/') { if (address[0] != '/') {
char runtime_dir[PATH_MAX]; char runtime_dir[PATH_MAX];
if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir), "pulse")) < 0) if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir))) < 0)
return res; return res;
res = snprintf(addr.sun_path, sizeof(addr.sun_path), res = snprintf(addr.sun_path, sizeof(addr.sun_path),

17
src/modules/module-protocol-pulse/utils.c
View file

@ -50,27 +50,30 @@
#include "log.h" #include "log.h"
#include "utils.h" #include "utils.h"
int get_runtime_dir(char *buf, size_t buflen, const char *dir) int get_runtime_dir(char *buf, size_t buflen)
{ {
const char *runtime_dir; const char *runtime_dir, *dir = NULL;
struct stat stat_buf; struct stat stat_buf;
int res, size; int res, size;
runtime_dir = getenv("PULSE_RUNTIME_PATH"); runtime_dir = getenv("PULSE_RUNTIME_PATH");
if (runtime_dir == NULL) if (runtime_dir == NULL) {
runtime_dir = getenv("XDG_RUNTIME_DIR"); runtime_dir = getenv("XDG_RUNTIME_DIR");
dir = "pulse";
}
if (runtime_dir == NULL) { if (runtime_dir == NULL) {
pw_log_error("could not find a suitable runtime directory in" pw_log_error("could not find a suitable runtime directory in"
"$PULSE_RUNTIME_PATH and $XDG_RUNTIME_DIR"); "$PULSE_RUNTIME_PATH and $XDG_RUNTIME_DIR");
return -ENOENT; return -ENOENT;
} }
size = snprintf(buf, buflen, "%s/%s", runtime_dir, dir); size = snprintf(buf, buflen, "%s%s%s", runtime_dir,
dir ? "/" : "", dir ? dir : "");
if (size < 0) if (size < 0)
return -errno; return -errno;
if ((size_t) size >= buflen) { if ((size_t) size >= buflen) {
pw_log_error("path %s/%s too long", runtime_dir, dir); pw_log_error("path %s%s%s too long", runtime_dir,
dir ? "/" : "", dir ? dir : "");
return -ENAMETOOLONG; return -ENAMETOOLONG;
} }
@ -182,7 +185,7 @@ int create_pid_file(void) {
FILE *f; FILE *f;
int res; int res;
if ((res = get_runtime_dir(pid_file, sizeof(pid_file), "pulse")) < 0) if ((res = get_runtime_dir(pid_file, sizeof(pid_file))) < 0)
return res; return res;
if (strlen(pid_file) > PATH_MAX - sizeof("/pid")) { if (strlen(pid_file) > PATH_MAX - sizeof("/pid")) {

2
src/modules/module-protocol-pulse/utils.h
View file

@ -31,7 +31,7 @@
struct client; struct client;
struct pw_context; struct pw_context;
int get_runtime_dir(char *buf, size_t buflen, const char *dir); int get_runtime_dir(char *buf, size_t buflen);
int check_flatpak(struct client *client, pid_t pid); int check_flatpak(struct client *client, pid_t pid);
pid_t get_client_pid(struct client *client, int client_fd); pid_t get_client_pid(struct client *client, int client_fd);
const char *get_server_name(struct pw_context *context); const char *get_server_name(struct pw_context *context);