luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-10-31 11:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix GHashTableIter layout for CHERI targets

Browse Source 
Last field needs to be pointer-size to match GHashTableIter. This happened
to work for most architecture due to alignment padding/pointer size, but
for CHERI targets with 128-bit pointers RealIter ends up being smaller
than GHashTableIter.

Helps: https://gitlab.gnome.org/GNOME/glib/-/issues/2842
This commit is contained in:
Alex Richardson 2022-12-14 23:55:18 +00:00
parent 702e606f73
commit 2aed76fc94
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/ghash.c
View File

@ -292,7 +292,7 @@ typedef struct
gpointer dummy2; gpointer dummy2;
gint position; gint position;
gboolean dummy3; gboolean dummy3;
gint version; gintptr version;
} RealIter; } RealIter;
G_STATIC_ASSERT (sizeof (GHashTableIter) == sizeof (RealIter)); G_STATIC_ASSERT (sizeof (GHashTableIter) == sizeof (RealIter));