projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2627f5
)
journald: fix count of object meta fields
author
Lennart Poettering
<lennart@poettering.net>
Wed, 5 Aug 2015 08:31:52 +0000
(11:31 +0300)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 5 Aug 2015 08:31:52 +0000
(11:31 +0300)
There are 12 object meta fields created in dispatch_message_real(), but
we only allocated space for 11. Fix this.
Fixes #866.
src/journal/journald-server.h
patch
|
blob
|
history
diff --git
a/src/journal/journald-server.h
b/src/journal/journald-server.h
index
559d100
..
d954c51
100644
(file)
--- a/
src/journal/journald-server.h
+++ b/
src/journal/journald-server.h
@@
-144,7
+144,7
@@
typedef struct Server {
#define N_IOVEC_META_FIELDS 20
#define N_IOVEC_KERNEL_FIELDS 64
#define N_IOVEC_UDEV_FIELDS 32
-#define N_IOVEC_OBJECT_FIELDS 1
1
+#define N_IOVEC_OBJECT_FIELDS 1
2
void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigned m, const struct ucred *ucred, const struct timeval *tv, const char *label, size_t label_len, const char *unit_id, int priority, pid_t object_pid);
void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,4);