mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-28 07:56:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

check for empty string before calling strtoul() and check errno

Browse source 
Note: since strtoul() has no real error return code (both 0 and
ULONG_MAX may be returned on both success and failure), set errno=0
before calling strtoul().
This commit is contained in:
Daniel Eklöf 2019-06-05 18:26:12 +02:00 committed by Brian Ashworth
parent 900d3287f9
commit b4b274cdce
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
swaybar/input.c
View file

@ -70,10 +70,11 @@ void update_cursor(struct swaybar_seat *seat) {
const char *cursor_theme = getenv("XCURSOR_THEME"); const char *cursor_theme = getenv("XCURSOR_THEME");
unsigned cursor_size = 24; unsigned cursor_size = 24;
const char *env_cursor_size = getenv("XCURSOR_SIZE"); const char *env_cursor_size = getenv("XCURSOR_SIZE");
if (env_cursor_size) { if (env_cursor_size && strlen(env_cursor_size) > 0) {
errno = 0;
char *end; char *end;
unsigned size = strtoul(env_cursor_size, &end, 10); unsigned size = strtoul(env_cursor_size, &end, 10);
if (!*end) { if (!*end && errno == 0) {
cursor_size = size; cursor_size = size;
} }
} }

5
swaynag/swaynag.c
View file

@ -132,10 +132,11 @@ static void update_cursor(struct swaynag *swaynag) {
const char *cursor_theme = getenv("XCURSOR_THEME"); const char *cursor_theme = getenv("XCURSOR_THEME");
unsigned cursor_size = 24; unsigned cursor_size = 24;
const char *env_cursor_size = getenv("XCURSOR_SIZE"); const char *env_cursor_size = getenv("XCURSOR_SIZE");
if (env_cursor_size) { if (env_cursor_size && strlen(env_cursor_size) > 0) {
errno = 0;
char *end; char *end;
unsigned size = strtoul(env_cursor_size, &end, 10); unsigned size = strtoul(env_cursor_size, &end, 10);
if (!*end) { if (!*end && errno == 0) {
cursor_size = size; cursor_size = size;
} }
} }