Skip to content

fix: avoid assuming struct packing #1084

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

Merged
merged 2 commits into from
Mar 20, 2025
Merged

fix: avoid assuming struct packing #1084

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffafb9c
fix: avoid assuming struct packing
elupus Mar 11, 2025
61a1b0b
Tweaked lfs_gstate_iszero for terseness
geky Mar 18, 2025
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
15 changes: 6 additions & 9 deletions lfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,18 +404,15 @@ struct lfs_diskoff {

// operations on global state
static inline void lfs_gstate_xor(lfs_gstate_t *a, const lfs_gstate_t *b) {
for (int i = 0; i < 3; i++) {
((uint32_t*)a)[i] ^= ((const uint32_t*)b)[i];
}
a->tag ^= b->tag;
a->pair[0] ^= b->pair[0];
a->pair[1] ^= b->pair[1];
}

static inline bool lfs_gstate_iszero(const lfs_gstate_t *a) {
for (int i = 0; i < 3; i++) {
if (((uint32_t*)a)[i] != 0) {
return false;
}
}
return true;
return a->tag == 0
&& a->pair[0] == 0
&& a->pair[1] == 0;
}

#ifndef LFS_READONLY
Expand Down