aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2018-01-18 16:02:25 +0000
committerThomas Adam <thomas@xteddy.org>2018-01-18 16:02:25 +0000
commit19afd842bf63b28f4ea087b171a6be36a404d8e2 (patch)
tree0db7e72f36fe16bea7246908aa20eeef931ad2bc
parentd9e740f86d256b9f5b235856bcb8bd697bf3c722 (diff)
parent17d4c39f24be7c22e1866d1587d77dcca7e6a2d8 (diff)
downloadrtmux-19afd842bf63b28f4ea087b171a6be36a404d8e2.tar.gz
rtmux-19afd842bf63b28f4ea087b171a6be36a404d8e2.tar.bz2
rtmux-19afd842bf63b28f4ea087b171a6be36a404d8e2.zip
Merge branch 'obsd-master'
-rw-r--r--format.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/format.c b/format.c
index 46f1a522..3ac3a33d 100644
--- a/format.c
+++ b/format.c
@@ -191,10 +191,15 @@ static void
format_job_update(struct job *job)
{
struct format_job *fj = job->data;
- char *line;
+ struct evbuffer *evb = job->event->input;
+ char *line = NULL, *next;
time_t t;
- if ((line = evbuffer_readline(job->event->input)) == NULL)
+ while ((next = evbuffer_readline(evb)) != NULL) {
+ free(line);
+ line = next;
+ }
+ if (line == NULL)
return;
fj->updated = 1;