mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: avoid “member access within misaligned address” ASAN warning

Browse source
This commit is contained in:
Daniel Eklöf 2021-06-23 14:30:02 +02:00
parent 136d60606a
commit 04d42662c7
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server.c
View file

@ -253,13 +253,13 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
/* Overrides */ /* Overrides */
for (uint16_t i = 0; i < cdata.override_count; i++) { for (uint16_t i = 0; i < cdata.override_count; i++) {
const struct client_string *arg = (const struct client_string *)p; struct client_string arg;
CHECK_BUF(sizeof(*arg)); CHECK_BUF(sizeof(arg));
p += 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; const char *str = (const char *)p;
p += arg->len; p += arg.len;
tll_push_back(overrides, xstrdup(str)); 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++) { for (uint16_t i = 0; i < cdata.argc; i++) {
struct client_string arg; struct client_string arg;
CHECK_BUF(sizeof(arg)); CHECK_BUF(sizeof(arg));
memcpy(&arg, p, sizeof(arg)); memcpy(&arg, p, sizeof(arg)); p += sizeof(arg);
p += sizeof(arg);
CHECK_BUF_AND_NULL(arg.len); CHECK_BUF_AND_NULL(arg.len);
argv[i] = (char *)p; p += arg.len; argv[i] = (char *)p; p += arg.len;