From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 30 May 2012 20:46:07 +0000 (+0200)
Subject: journal: don't allow adding invalid matches to the context
X-Git-Tag: v184~8
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d94117a93c0a8431de5c765f21a97f6eb32580da

journal: don't allow adding invalid matches to the context
---

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 09ce949d3..9f46f5c6a 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -115,7 +115,11 @@ _public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size)
                 return -EINVAL;
         if (!data)
                 return -EINVAL;
-        if (size <= 0)
+        if (size <= 1)
+                return -EINVAL;
+        if (!memchr(data, '=', size))
+                return -EINVAL;
+        if (*(char*) data == '=')
                 return -EINVAL;
 
         /* FIXME: iterating with multiple matches is currently