From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 12 Jul 2012 22:10:37 +0000 (+0200)
Subject: journal: check fields we search for more carefully
X-Git-Tag: v187~118
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=362a3f8122e070589a4d61f7752b990090c75432

journal: check fields we search for more carefully
---

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index b6e74a0d4..f4ef1aea7 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1426,6 +1426,34 @@ _public_ int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id12
         return 0;
 }
 
+static bool field_is_valid(const char *field) {
+        const char *p;
+
+        assert(field);
+
+        if (isempty(field))
+                return false;
+
+        if (startswith(field, "__"))
+                return false;
+
+        for (p = field; *p; p++) {
+
+                if (*p == '_')
+                        continue;
+
+                if (*p >= 'A' && *p <= 'Z')
+                        continue;
+
+                if (*p >= '0' && *p <= '9')
+                        continue;
+
+                return false;
+        }
+
+        return true;
+}
+
 _public_ int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *size) {
         JournalFile *f;
         uint64_t i, n;
@@ -1442,7 +1470,7 @@ _public_ int sd_journal_get_data(sd_journal *j, const char *field, const void **
         if (!size)
                 return -EINVAL;
 
-        if (isempty(field) || strchr(field, '='))
+        if (!field_is_valid(field))
                 return -EINVAL;
 
         f = j->current_file;