X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fbus-error.c;h=af83c12d53971cbcca81465ced712da0abf865b0;hp=5ca974a1910c7a5647dd186499876402f3af9aee;hb=455cd8b137b8ef45d04889f2d967c562a097f1e6;hpb=bb1fada8cc691821ade680c36dfb2be13e0658d6

diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index 5ca974a19..af83c12d5 100644
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -194,13 +194,10 @@ int bus_error_setfv(sd_bus_error *e, const char *name, const char *format, va_li
                 return -ENOMEM;
         }
 
-        if (format) {
-                int r;
-
-                r = vasprintf((char**) &e->message, format, ap);
-                if (r < 0)
-                        return -ENOMEM;
-        }
+        /* Of we hit OOM on formatting the pretty message, we ignore
+         * this, since we at least managed to write the error name */
+        if (format)
+                (void) vasprintf((char**) &e->message, format, ap);
 
         e->_need_free = 1;