From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 14 Oct 2011 02:52:56 +0000 (+0200)
Subject: journal: fix field retrieval by name
X-Git-Tag: v38~144^2~53
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=161e54f8719c4a11440d762276cbccbeb1736f8c;p=systemd

journal: fix field retrieval by name
---

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 6f475202..1f4ad0ff 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -493,22 +493,24 @@ int sd_journal_get_field(sd_journal *j, const char *field, const void **data, si
 
                 l = le64toh(o->object.size) - offsetof(Object, data.payload);
 
-                if (field_length+1 > l)
-                        continue;
+                if (l >= field_length+1 &&
+                    memcmp(o->data.payload, field, field_length) == 0 &&
+                    o->data.payload[field_length] == '=') {
 
-                if (memcmp(o->data.payload, field, field_length) ||
-                    o->data.payload[field_length] != '=')
-                        continue;
+                        t = (size_t) l;
 
-                t = (size_t) l;
+                        if ((uint64_t) t != l)
+                                return -E2BIG;
 
-                if ((uint64_t) t != l)
-                        return -E2BIG;
+                        *data = o->data.payload;
+                        *size = t;
 
-                *data = o->data.payload;
-                *size = t;
+                        return 1;
+                }
 
-                return 1;
+                r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
+                if (r < 0)
+                        return r;
         }
 
         return 0;