diff options
| author | Djalal Harouni <tixxdz@opendz.org> | 2017-03-06 17:25:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-06 17:25:40 +0100 |
| commit | 81687ee3382d5a3a63f8aba1cd24b0517be1f8e4 (patch) | |
| tree | bbc4398dc1f141b59365f609378a0cae411ea7df | |
| parent | 77313738fe0d656e6aa034a501b80def18a43103 (diff) | |
| parent | d74dc4f2d00644c04ad9dc900ef43050fcadaa8b (diff) | |
Merge pull request #5540 from keszybz/coredump-eof-fix
coredump: fix handling of premature-eof for --backtrace
| -rw-r--r-- | src/basic/journal-importer.c | 2 | ||||
| -rw-r--r-- | src/coredump/coredump.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/basic/journal-importer.c b/src/basic/journal-importer.c index 4c13e46a49..d25fd358e8 100644 --- a/src/basic/journal-importer.c +++ b/src/basic/journal-importer.c @@ -314,7 +314,7 @@ int journal_importer_process_data(JournalImporter *imp) { return r; if (r == 0) { imp->state = IMPORTER_STATE_EOF; - return r; + return 0; } assert(n > 0); assert(line[n-1] == '\n'); diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index 4c4f36aea0..5828e949e3 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.c @@ -1326,7 +1326,8 @@ static int process_backtrace(int argc, char *argv[]) { log_error_errno(r, "Failed to parse journal entry on stdin: %m"); goto finish; } - if (r == 1) + if (r == 1 || /* complete entry */ + journal_importer_eof(&importer)) /* end of data */ break; } |