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: sync kdbus.h (ABI break)
[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 c2e41fb01676de2e7e79c7b4b9276af042a0e4f5..5ca974a1910c7a5647dd186499876402f3af9aee 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-error.c
+++ b/
src/libsystemd/sd-bus/bus-error.c
@@
-194,8
+194,13
@@
int bus_error_setfv(sd_bus_error *e, const char *name, const char *format, va_li
return -ENOMEM;
}
return -ENOMEM;
}
- if (format)
- vasprintf((char**) &e->message, format, ap);
+ if (format) {
+ int r;
+
+ r = vasprintf((char**) &e->message, format, ap);
+ if (r < 0)
+ return -ENOMEM;
+ }
e->_need_free = 1;
e->_need_free = 1;
@@
-312,7
+317,7
@@
static void bus_error_strerror(sd_bus_error *e, int error) {
continue;
}
continue;
}
- if (
!x ||
errno) {
+ if (errno) {
free(m);
return;
}
free(m);
return;
}