chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: when enabling a generated unit file, return a clean error
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-socket.c
diff --git
a/src/libelogind/sd-bus/bus-socket.c
b/src/libelogind/sd-bus/bus-socket.c
index a2fb3912393b78b9a2175398ced956355d46f036..f1e2a06050153732f5c56b3ca5095d757b3ff87c 100644
(file)
--- a/
src/libelogind/sd-bus/bus-socket.c
+++ b/
src/libelogind/sd-bus/bus-socket.c
@@
-60,7
+60,7
@@
static void iovec_advance(struct iovec iov[], unsigned *idx, size_t size) {
i->iov_base = NULL;
i->iov_len = 0;
i->iov_base = NULL;
i->iov_len = 0;
- (*idx)
++;
+ (*idx)++;
}
}
}
}
@@
-350,7
+350,7
@@
static int bus_socket_auth_write(sd_bus *b, const char *t) {
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
- memcpy(p, b->auth_iovec[0].iov_base, b->auth_iovec[0].iov_len);
+ memcpy
_safe
(p, b->auth_iovec[0].iov_base, b->auth_iovec[0].iov_len);
memcpy(p + b->auth_iovec[0].iov_len, t, l);
b->auth_iovec[0].iov_base = p;
memcpy(p + b->auth_iovec[0].iov_len, t, l);
b->auth_iovec[0].iov_base = p;
@@
-787,7
+787,7
@@
int bus_socket_write_message(sd_bus *bus, sd_bus_message *m, size_t *idx) {
n = m->n_iovec * sizeof(struct iovec);
iov = alloca(n);
n = m->n_iovec * sizeof(struct iovec);
iov = alloca(n);
- memcpy(iov, m->iovec, n);
+ memcpy
_safe
(iov, m->iovec, n);
j = 0;
iovec_advance(iov, &j, *idx);
j = 0;
iovec_advance(iov, &j, *idx);
@@
-998,7
+998,7
@@
int bus_socket_read_message(sd_bus *bus) {
return -ENOMEM;
}
return -ENOMEM;
}
- memcpy(f + bus->n_fds, CMSG_DATA(cmsg), n * sizeof(int));
+ memcpy
_safe
(f + bus->n_fds, CMSG_DATA(cmsg), n * sizeof(int));
bus->fds = f;
bus->n_fds += n;
} else
bus->fds = f;
bus->n_fds += n;
} else