chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8249950
)
journald: stpcpy() + mempcpy() are awesome
author
Lennart Poettering
<lennart@poettering.net>
Tue, 5 Mar 2013 14:02:38 +0000
(15:02 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 5 Mar 2013 14:02:38 +0000
(15:02 +0100)
src/journal/journald-server.c
patch
|
blob
|
history
diff --git
a/src/journal/journald-server.c
b/src/journal/journald-server.c
index c1ec0fad32f4ea23e407b159473c0b85dd1a3c7e..654f7ace2177e2f309a4ff92d7cc27ab3e02c223 100644
(file)
--- a/
src/journal/journald-server.c
+++ b/
src/journal/journald-server.c
@@
-620,9
+620,7
@@
static void dispatch_message_real(
if (label) {
selinux_context = malloc(sizeof("_SELINUX_CONTEXT=") + label_len);
if (selinux_context) {
if (label) {
selinux_context = malloc(sizeof("_SELINUX_CONTEXT=") + label_len);
if (selinux_context) {
- memcpy(selinux_context, "_SELINUX_CONTEXT=", sizeof("_SELINUX_CONTEXT=")-1);
- memcpy(selinux_context+sizeof("_SELINUX_CONTEXT=")-1, label, label_len);
- selinux_context[sizeof("_SELINUX_CONTEXT=")-1+label_len] = 0;
+ *((char*) mempcpy(stpcpy(selinux_context, "_SELINUX_CONTEXT="), label, label_len)) = 0;
IOVEC_SET_STRING(iovec[n++], selinux_context);
}
} else {
IOVEC_SET_STRING(iovec[n++], selinux_context);
}
} else {
@@
-632,7
+630,6
@@
static void dispatch_message_real(
selinux_context = strappend("_SELINUX_CONTEXT=", con);
if (selinux_context)
IOVEC_SET_STRING(iovec[n++], selinux_context);
selinux_context = strappend("_SELINUX_CONTEXT=", con);
if (selinux_context)
IOVEC_SET_STRING(iovec[n++], selinux_context);
-
freecon(con);
}
}
freecon(con);
}
}