From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 24 May 2023 12:17:25 +0000 (+0200)
Subject: sd-journal: propagate errors from ordered_hashmap_*()
X-Git-Tag: v254-rc1~387^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08a8fd6e8d;p=thirdparty%2Fsystemd.git

sd-journal: propagate errors from ordered_hashmap_*()

Instead of masking them with -ENOMEM.
---

diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c
index 7f1dc0b4ed7..06cf396b959 100644
--- a/src/libsystemd/sd-journal/catalog.c
+++ b/src/libsystemd/sd-journal/catalog.c
@@ -147,6 +147,7 @@ static int finish_item(
         _cleanup_free_ CatalogItem *i = NULL;
         _cleanup_free_ char *combined = NULL;
         char *prev;
+        int r;
 
         assert(h);
         assert(payload);
@@ -169,8 +170,9 @@ static int finish_item(
                 if (!combined)
                         return log_oom();
 
-                if (ordered_hashmap_update(h, i, combined) < 0)
-                        return log_oom();
+                r = ordered_hashmap_update(h, i, combined);
+                if (r < 0)
+                        return r;
 
                 TAKE_PTR(combined);
                 free(prev);
@@ -180,8 +182,9 @@ static int finish_item(
                 if (!combined)
                         return log_oom();
 
-                if (ordered_hashmap_put(h, i, combined) < 0)
-                        return log_oom();
+                r = ordered_hashmap_put(h, i, combined);
+                if (r < 0)
+                        return r;
 
                 TAKE_PTR(i);
                 TAKE_PTR(combined);