From cb52454945fe9c23635c775e3804eaab56b5c086 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 23 Jun 2017 12:28:14 -0400
Subject: [PATCH] Merge pull request #1251 from Hummer12007/icons

Handle getline failure in icon theme parsing
---
 swaybar/tray/icon.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/swaybar/tray/icon.c b/swaybar/tray/icon.c
index 29151a746..1c69ba720 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') {