sd-journal: fix sd_journal_enumerate_unique skipping values

[elogind.git] / src / journal / sd-journal.c

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index b72a0867e78c7d5a6a2f089ef99b2c2f04089af8..479444c8dff94b8a4c22234a120d347cb5f3842f 100644 (file)
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -2528,6 +2528,7 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
                 size_t ol;
                 bool found;
                 int r;
                 size_t ol;
                 bool found;
                 int r;

+                void *release_cookie;

 
                 /* Proceed to next data object in the field's linked list */
                 if (j->unique_offset == 0) {
 
                 /* Proceed to next data object in the field's linked list */
                 if (j->unique_offset == 0) {


@@ -2568,7 +2569,7 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
                         return -EBADMSG;
                 }
 
                         return -EBADMSG;
                 }
 

-                r = journal_file_object_keep(j->unique_file, o, j->unique_offset);
+                r = journal_file_object_keep(j->unique_file, o, j->unique_offset, &release_cookie);

                 if (r < 0)
                         return r;
 
                 if (r < 0)
                         return r;
 


@@ -2616,13 +2617,13 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
                                 found = true;
                 }
 
                                 found = true;
                 }
 

-                if (found)
-                        continue;
-
-                r = journal_file_object_release(j->unique_file, o, j->unique_offset);
+                r = journal_file_object_release(j->unique_file, release_cookie);

                 if (r < 0)
                         return r;
 
                 if (r < 0)
                         return r;
 

+                if (found)
+                        continue;
+

                 r = return_data(j, j->unique_file, o, data, l);
                 if (r < 0)
                         return r;
                 r = return_data(j, j->unique_file, o, data, l);
                 if (r < 0)
                         return r;