AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Check that XDG base directories paths are absolute

Browse Source 
The [spec][1] reads:

> All paths set in these environment variables must be absolute. If an
> implementation encounters a relative path in any of these variables it should
> consider the path invalid and ignore it.

and

> If $XDG_DATA_HOME is either not set or empty, a default equal to
> $HOME/.local/share should be used.

Testing that the path is absolute also entails that is is non-empty.

[1]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html

Signed-off-by: Antonin Décimo <antonin.decimo@gmail.com>
This commit is contained in:
Antonin Décimo 2022-03-11 14:08:49 +01:00 committed by Simon Ser
parent f710d01663
commit 9434e8d69f
8 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cursor/os-compatibility.c
View File

@ -136,7 +136,7 @@ os_create_anonymous_file(off_t size)
#endif #endif
{ {
path = getenv("XDG_RUNTIME_DIR"); path = getenv("XDG_RUNTIME_DIR");
if (!path) { if (!path || path[0] != '/') {
errno = ENOENT; errno = ENOENT;
return -1; return -1;
} }

2
cursor/xcursor.c
View File

@ -515,7 +515,7 @@ xcursor_library_path(void)
return strdup(env_var); return strdup(env_var);
env_var = getenv("XDG_DATA_HOME"); env_var = getenv("XDG_DATA_HOME");
if (!env_var) if (!env_var || env_var[0] != '/')
env_var = XDG_DATA_HOME_FALLBACK; env_var = XDG_DATA_HOME_FALLBACK;
suffix = CURSORDIR ":" XCURSORPATH; suffix = CURSORDIR ":" XCURSORPATH;

4
src/wayland-client.c
View File

@ -1076,8 +1076,8 @@ connect_to_socket(const char *name)
path_is_absolute = name[0] == '/'; path_is_absolute = name[0] == '/';
runtime_dir = getenv("XDG_RUNTIME_DIR"); runtime_dir = getenv("XDG_RUNTIME_DIR");
if (!runtime_dir && !path_is_absolute) { if (((!runtime_dir || runtime_dir[0] != '/') && !path_is_absolute)) {
wl_log("error: XDG_RUNTIME_DIR not set in the environment.\n"); wl_log("error: XDG_RUNTIME_DIR is invalid or not set in the environment.\n");
/* to prevent programs reporting /* to prevent programs reporting
* "failed to create display: Success" */ * "failed to create display: Success" */
errno = ENOENT; errno = ENOENT;

7
src/wayland-server.c
View File

@ -1557,8 +1557,9 @@ wl_socket_init_for_display_name(struct wl_socket *s, const char *name)
if (name[0] != '/') { if (name[0] != '/') {
runtime_dir = getenv("XDG_RUNTIME_DIR"); runtime_dir = getenv("XDG_RUNTIME_DIR");
if (!runtime_dir) { if (!runtime_dir || runtime_dir[0] != '/') {
wl_log("error: XDG_RUNTIME_DIR not set in the environment\n"); wl_log("error: XDG_RUNTIME_DIR is invalid or not set in"
" the environment\n");
/* to prevent programs reporting /* to prevent programs reporting
* "failed to add socket: Success" */ * "failed to add socket: Success" */
@ -1718,7 +1719,7 @@ wl_display_add_socket_fd(struct wl_display *display, int sock_fd)
* *
* If the socket name is a relative path, the Unix socket will be created in * If the socket name is a relative path, the Unix socket will be created in
* the directory pointed to by environment variable XDG_RUNTIME_DIR. If * the directory pointed to by environment variable XDG_RUNTIME_DIR. If
* XDG_RUNTIME_DIR is not set, then this function fails and returns -1. * XDG_RUNTIME_DIR is invalid or not set, then this function fails and returns -1.
* *
* If the socket name is an absolute path, then it is used as-is for the * If the socket name is an absolute path, then it is used as-is for the
* the Unix socket. * the Unix socket.

2
tests/compositor-introspection-test.c
View File

@ -40,7 +40,7 @@ static const char *
require_xdg_runtime_dir(void) require_xdg_runtime_dir(void)
{ {
char *val = getenv("XDG_RUNTIME_DIR"); char *val = getenv("XDG_RUNTIME_DIR");
assert(val && "set $XDG_RUNTIME_DIR to run this test"); assert(val && val[0] == '/' && "set $XDG_RUNTIME_DIR to run this test");
return val; return val;
} }

2
tests/protocol-logger-test.c
View File

@ -40,7 +40,7 @@ static const char *
require_xdg_runtime_dir(void) require_xdg_runtime_dir(void)
{ {
char *val = getenv("XDG_RUNTIME_DIR"); char *val = getenv("XDG_RUNTIME_DIR");
assert(val && "set $XDG_RUNTIME_DIR to run this test"); assert(val && val[0] == '/' && "set $XDG_RUNTIME_DIR to run this test");
return val; return val;
} }

2
tests/socket-test.c
View File

@ -51,7 +51,7 @@ static const char *
require_xdg_runtime_dir(void) require_xdg_runtime_dir(void)
{ {
char *val = getenv("XDG_RUNTIME_DIR"); char *val = getenv("XDG_RUNTIME_DIR");
assert(val && "set $XDG_RUNTIME_DIR to run this test"); assert(val && val[0] == '/' && "set $XDG_RUNTIME_DIR to run this test");
return val; return val;
} }

4
tests/test-runner.c
View File

@ -180,7 +180,7 @@ set_xdg_runtime_dir(void)
xrd_env = getenv("XDG_RUNTIME_DIR"); xrd_env = getenv("XDG_RUNTIME_DIR");
/* if XDG_RUNTIME_DIR is not set in environ, fallback to /tmp */ /* if XDG_RUNTIME_DIR is not set in environ, fallback to /tmp */
assert((snprintf(xdg_runtime_dir, PATH_MAX, "%s/wayland-tests-XXXXXX", assert((snprintf(xdg_runtime_dir, PATH_MAX, "%s/wayland-tests-XXXXXX",
xrd_env ? xrd_env : "/tmp") < PATH_MAX) (xrd_env && xrd_env[0] == '/') ? xrd_env : "/tmp") < PATH_MAX)
&& "test error: XDG_RUNTIME_DIR too long"); && "test error: XDG_RUNTIME_DIR too long");
assert(mkdtemp(xdg_runtime_dir) && "test error: mkdtemp failed"); assert(mkdtemp(xdg_runtime_dir) && "test error: mkdtemp failed");
@ -200,7 +200,7 @@ static void
rmdir_xdg_runtime_dir(void) rmdir_xdg_runtime_dir(void)
{ {
const char *xrd_env = getenv("XDG_RUNTIME_DIR"); const char *xrd_env = getenv("XDG_RUNTIME_DIR");
assert(xrd_env && "No XDG_RUNTIME_DIR set"); assert(xrd_env && xrd_env[0] == '/' && "No XDG_RUNTIME_DIR set");
/* rmdir may fail if some test didn't do clean up */ /* rmdir may fail if some test didn't do clean up */
if (rmdir(xrd_env) == -1) if (rmdir(xrd_env) == -1)