diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2017-06-23 12:28:14 -0400 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2017-06-23 12:28:14 -0400 |
| commit | bf34c7611d816f17a44504d3666a707b5ecbcaf6 (patch) | |
| tree | fd4ff4b7e1f4779a5585f4fd98bb461ae6a1ce4c | |
| parent | ab45a539822605ab1af2063150822f4df00cfc5b (diff) | |
Merge pull request #1251 from Hummer12007/icons
Handle getline failure in icon theme parsing
| -rw-r--r-- | swaybar/tray/icon.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/swaybar/tray/icon.c b/swaybar/tray/icon.c index 29151a74..1c69ba72 100644 --- a/swaybar/tray/icon.c +++ b/swaybar/tray/icon.c @@ -49,8 +49,7 @@ static list_t *find_inherits(const char *theme_dir) { char *buf = NULL; size_t n = 0; - while (!feof(index)) { - getline(&buf, &n, index); + while (!feof(index) && getline(&buf, &n, index) != -1) { if (n <= sizeof(inherits) + 1) { continue; } @@ -247,9 +246,8 @@ static list_t* find_theme_subdirs(const char *theme_dir) { char *buf = NULL; size_t n = 0; - while (!feof(index)) { - const char directories[] = "Directories"; - getline(&buf, &n, index); + const char directories[] = "Directories"; + while (!feof(index) && getline(&buf, &n, index) != -1) { if (n <= sizeof(directories) + 1) { continue; } @@ -261,10 +259,8 @@ static list_t* find_theme_subdirs(const char *theme_dir) { } // Now, find the size of each dir struct subdir *current_subdir = NULL; - while (!feof(index)) { - const char size[] = "Size"; - getline(&buf, &n, index); - + const char size[] = "Size"; + while (!feof(index) && getline(&buf, &n, index) != -1) { if (buf[0] == '[') { int len = strlen(buf); if (buf[len-1] == '\n') { |