aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-06-23 12:30:02 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-06-23 13:12:08 +0000
commit04d42662c78823fbb2e71c7a481c86293a031c9a (patch)
tree96d9aa7ee235bf6dba84f9e0e361b47ca79a4770 /server.c
parentclient: send overrides for everything that is publicly visible in the conf (diff)
server: avoid “member access within misaligned address” ASAN warning
Diffstat (limited to 'server.c')
-rw-r--r--server.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/server.c b/server.c
index 36bb0ddc..b8ae5685 100644
--- a/server.c
+++ b/server.c
@@ -253,13 +253,13 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
/* Overrides */
for (uint16_t i = 0; i < cdata.override_count; i++) {
- const struct client_string *arg = (const struct client_string *)p;
- CHECK_BUF(sizeof(*arg));
- p += sizeof(*arg);
+ struct client_string arg;
+ CHECK_BUF(sizeof(arg));
+ memcpy(&arg, p, sizeof(arg)); p += sizeof(arg);
- CHECK_BUF_AND_NULL(arg->len);
+ CHECK_BUF_AND_NULL(arg.len);
const char *str = (const char *)p;
- p += arg->len;
+ p += arg.len;
tll_push_back(overrides, xstrdup(str));
}
@@ -269,8 +269,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
for (uint16_t i = 0; i < cdata.argc; i++) {
struct client_string arg;
CHECK_BUF(sizeof(arg));
- memcpy(&arg, p, sizeof(arg));
- p += sizeof(arg);
+ memcpy(&arg, p, sizeof(arg)); p += sizeof(arg);
CHECK_BUF_AND_NULL(arg.len);
argv[i] = (char *)p; p += arg.len;