alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1251 from Hummer12007/icons

Browse source 
Handle getline failure in icon theme parsing
This commit is contained in:
Drew DeVault 2017-06-23 12:28:14 -04:00 committed by GitHub
parent 9ae3b2fb0b ed8f56ba38
commit 7ca0912527
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
swaybar/tray/icon.c
View file

@ -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') {