chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: if we don't manage to properly allocate the error message for an sd_bus_error...
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-error.c
diff --git
a/src/libsystemd/sd-bus/bus-error.c
b/src/libsystemd/sd-bus/bus-error.c
index 5ca974a1910c7a5647dd186499876402f3af9aee..af83c12d53971cbcca81465ced712da0abf865b0 100644
(file)
--- 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;
}
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;
e->_need_free = 1;