Skip to content

Fixed UBSan warnings about unaligned memory access #3208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −12
Open

Fixed UBSan warnings about unaligned memory access #3208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions libsrc/ncx.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,14 +305,16 @@ swapn2b(void *dst, const void *src, IntType nn)
{
/* it is OK if dst == src */
IntType i;
uint16_t *op = (uint16_t*) dst;
uint16_t *ip = (uint16_t*) src;
char *op = (char*) dst;
char *ip = (char*) src;
uint16_t tmp;
for (i=0; i<nn; i++) {
/* memcpy is used to handle the case of unaligned memory */
memcpy(&tmp, &ip[i], sizeof(tmp));
memcpy(&tmp, ip, sizeof(tmp));
tmp = SWAP2(tmp);
memcpy(&op[i], &tmp, sizeof(tmp));
memcpy(op, &tmp, sizeof(tmp));
ip += sizeof(uint16_t);
op += sizeof(uint16_t);
}
}

Expand All @@ -332,14 +334,16 @@ inline static void
swapn4b(void *dst, const void *src, IntType nn)
{
IntType i;
uint32_t *op = (uint32_t*) dst;
uint32_t *ip = (uint32_t*) src;
char *op = (char*) dst;
char *ip = (char*) src;
uint32_t tmp;
for (i=0; i<nn; i++) {
/* memcpy is used to handle the case of unaligned memory */
memcpy(&tmp, &ip[i], sizeof(tmp));
memcpy(&tmp, ip, sizeof(tmp));
tmp = SWAP4(tmp);
memcpy(&op[i], &tmp, sizeof(tmp));
memcpy(op, &tmp, sizeof(tmp));
ip += sizeof(uint32_t);
op += sizeof(uint32_t);
}
}

Expand All @@ -360,14 +364,16 @@ inline static void
swapn8b(void *dst, const void *src, IntType nn)
{
IntType i;
uint64_t *op = (uint64_t*) dst;
uint64_t *ip = (uint64_t*) src;
char *op = (char*) dst;
char *ip = (char*) src;
uint64_t tmp;
for (i=0; i<nn; i++) {
/* memcpy is used to handle the case of unaligned memory */
memcpy(&tmp, &ip[i], sizeof(tmp));
memcpy(&tmp, ip, sizeof(tmp));
tmp = SWAP8(tmp);
memcpy(&op[i], &tmp, sizeof(tmp));
memcpy(op, &tmp, sizeof(tmp));
ip += sizeof(uint64_t);
op += sizeof(uint64_t);
}
}
# endif /* !vax */
Expand Down
Loading