From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 10 Apr 2013 10:53:58 +0000 (+0200)
Subject: journalctl: check return of strjoin
X-Git-Tag: v202~159
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3a819b1b6289311ebf09e94c6240dfb6be7a0496;ds=sidebyside

journalctl: check return of strjoin
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 86895b8f5..002ff7cda 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1035,7 +1035,7 @@ int main(int argc, char *argv[]) {
                 char _cleanup_free_ *copy = NULL;
                 if (arg_root) {
                         copy = strjoin(arg_root, "/", CATALOG_DATABASE, NULL);
-                        if (!database) {
+                        if (!copy) {
                                 r = log_oom();
                                 goto finish;
                         }