chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: don't free an unallocated var
[elogind.git]
/
src
/
libsystemd-bus
/
sd-bus.c
diff --git
a/src/libsystemd-bus/sd-bus.c
b/src/libsystemd-bus/sd-bus.c
index 88f17a26003e672e7d189c6d5c5e8fc627b84726..0acc6b2d1e6e533385f2a10177a37a54920e817e 100644
(file)
--- a/
src/libsystemd-bus/sd-bus.c
+++ b/
src/libsystemd-bus/sd-bus.c
@@
-972,11
+972,10
@@
static int message_make(sd_bus *bus, size_t size, sd_bus_message **m) {
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
if (bus->rbuffer_size > size) {
assert(bus->state == BUS_RUNNING || bus->state == BUS_HELLO);
if (bus->rbuffer_size > size) {
- b = memdup((const uint8_t*) bus->rbuffer + size,
bus->rbuffer_size - size);
- if (!b) {
- free(t);
+ b = memdup((const uint8_t*) bus->rbuffer + size,
+ bus->rbuffer_size - size);
+ if (!b)
return -ENOMEM;
return -ENOMEM;
- }
}
r = bus_message_from_malloc(bus->rbuffer, size,
}
r = bus_message_from_malloc(bus->rbuffer, size,
@@
-1536,7
+1535,6
@@
int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) {
}
static int process_timeout(sd_bus *bus) {
}
static int process_timeout(sd_bus *bus) {
- _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
struct reply_callback *c;
usec_t n;
int r;
struct reply_callback *c;
usec_t n;
int r;