aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranjal Kole <pranjal.kole7@gmail.com>2022-01-29 10:48:19 +0000
committerPranjal Kole <pranjal.kole7@gmail.com>2022-01-29 10:48:19 +0000
commitfa396cdc33c81cae52942154d69db39ee7079748 (patch)
tree022a5e3410b477e9b1b4a290dfd4ec43f1affb0d
parentdoc: foot.1: add missing ‘*’ (diff)
wayland: use getenv() according to spec
From the NOTES section of getenv(3): The string pointed to by the return value of getenv() may be statically allocated, and can be modified by a subsequent call to getenv()... So, previously xcursor_theme could be modified by libc to contain xcursor_size. This has been fixed by getting xcursor_theme after computing the value of xcursor_size.
-rw-r--r--wayland.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wayland.c b/wayland.c
index 12e3f5b3..e9f7d063 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1630,7 +1630,6 @@ wayl_reload_xcursor_theme(struct seat *seat, int new_scale)
seat->pointer.cursor = NULL;
}
- const char *xcursor_theme = getenv("XCURSOR_THEME");
int xcursor_size = 24;
{
@@ -1642,6 +1641,8 @@ wayl_reload_xcursor_theme(struct seat *seat, int new_scale)
}
}
+ const char *xcursor_theme = getenv("XCURSOR_THEME");
+
LOG_INFO("cursor theme: %s, size: %u, scale: %d",
xcursor_theme, xcursor_size, new_scale);