util/json_streaming_read: properly handle EOF

2 files changed, 5 insertions, 4 deletions

diff --git a/src/jobs.c b/src/jobs.c
index b5fd31c..0205c71 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -141,7 +141,7 @@ int job_read(FILE *stream, struct job **job)
 	char *drv_path = NULL;
 
 	ret = json_streaming_read(stream, &root);
-	if (ret < 0)
+	if (ret < 0 || ret == -EOF)
 		return ret;
 
 	temp = cJSON_GetObjectItemCaseSensitive(root, "name");
diff --git a/src/queue.c b/src/queue.c
index 5c196aa..6bf9092 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -16,9 +16,10 @@ void *queue_thread_entry(void *queue_thread)
 
 	while (true) {
 		ret = job_read(qt->stream, &job);
-		if (ret < 0) {
-			if (ret == -EOF)
-				ret = 0;
+		if (ret == -EOF) {
+			ret = 0;
+			break;
+		} else if (ret < 0) {
 			break;
 		}