mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-07 08:21:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins: allow some absolute paths

Browse source 
Allow abosulte paths as long as they start with one of the search paths.
This commit is contained in:
Wim Taymans 2026-04-07 09:44:22 +02:00
parent 57299da899
commit 50aacea749
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spa/plugins/filter-graph/plugin_ladspa.c
View file

@ -265,7 +265,11 @@ static int load_ladspa_plugin(struct plugin *impl, const char *path, const char
if (len >= sizeof(filename))
continue;
namelen = snprintf(filename, sizeof(filename), "%.*s/%s.so", (int) len, p, path);
if (strncmp(path, p, len) == 0)
namelen = snprintf(filename, sizeof(filename), "%s", path);
else
namelen = snprintf(filename, sizeof(filename), "%.*s/%s.so", (int) len, p, path);
if (namelen < 0 || (size_t) namelen >= sizeof(filename))
continue;
@ -340,7 +344,7 @@ impl_init(const struct spa_handle_factory *factory,
make_search_paths(&path, &search_dirs);
if ((res = load_ladspa_plugin(impl, path, search_dirs)) < 0) {
spa_log_error(impl->log, "failed to load plugin '%s.so' in '%s': %s",
spa_log_error(impl->log, "failed to load plugin '%s' in '%s': %s",
path, search_dirs, spa_strerror(res));
return res;
}

18
src/modules/module-jack-tunnel/weakjack.h
View file

@ -170,18 +170,22 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib)
search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:"
"/usr/lib64/:/usr/lib/:" LIBDIR;
res = -ENAMETOOLONG;
while ((p = pw_split_walk(search_dirs, ":", &len, &state))) {
int pathlen;
if (len >= sizeof(path)) {
res = -ENAMETOOLONG;
if (len >= sizeof(path))
continue;
}
pathlen = snprintf(path, sizeof(path), "%.*s/%s", (int) len, p, lib);
if (pathlen < 0 || (size_t) pathlen >= sizeof(path)) {
res = -ENAMETOOLONG;
if (strncmp(lib, p, len) == 0)
pathlen = snprintf(path, sizeof(path), "%s", lib);
else
pathlen = snprintf(path, sizeof(path), "%.*s/%s", (int) len, p, lib);
if (pathlen < 0 || (size_t) pathlen >= sizeof(path))
continue;
}
if ((res = weakjack_load_by_path(jack, path)) == 0)
break;
}