From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Sep 2012 14:16:39 +0000 (+0200)
Subject: journal: don't allow journal_file_open() to be called with ret being NULL
X-Git-Tag: v191~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0559d3a58ac25a37b832f12fbdefef58fd351270;p=elogind.git

journal: don't allow journal_file_open() to be called with ret being NULL
---

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index e778e1c67..6db9955aa 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2012,6 +2012,7 @@ int journal_file_open(
         bool newly_created = false;
 
         assert(fname);
+        assert(ret);
 
         if ((flags & O_ACCMODE) != O_RDONLY &&
             (flags & O_ACCMODE) != O_RDWR)
@@ -2156,9 +2157,7 @@ int journal_file_open(
         if (r < 0)
                 goto fail;
 
-        if (ret)
-                *ret = f;
-
+        *ret = f;
         return 0;
 
 fail: