luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'g-atomic-array-alignment' into 'main'

Browse Source 
GAtomicArray: Ensure metadata does not misalign the payload

See merge request GNOME/glib!3242
This commit is contained in:
Philip Withnall 2023-02-06 14:08:06 +00:00
commit 6ba1627fe6
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gobject/gatomicarray.c
View File

@ -76,13 +76,14 @@ freelist_alloc (gsize size, gboolean reuse)
} }
} }
real_size = sizeof (gsize) + MAX (size, sizeof (FreeListNode)); real_size = sizeof (GAtomicArrayMetadata) + MAX (size, sizeof (FreeListNode));
mem = g_slice_alloc (real_size); mem = g_slice_alloc (real_size);
mem = ((char *) mem) + sizeof (gsize); mem = ((char *) mem) + sizeof (GAtomicArrayMetadata);
G_ATOMIC_ARRAY_DATA_SIZE (mem) = size; G_ATOMIC_ARRAY_DATA_SIZE (mem) = size;
#if ENABLE_VALGRIND #if ENABLE_VALGRIND
VALGRIND_MALLOCLIKE_BLOCK (mem, real_size - sizeof (gsize), FALSE, FALSE); VALGRIND_MALLOCLIKE_BLOCK (mem, real_size - sizeof (GAtomicArrayMetadata),
FALSE, FALSE);
#endif #endif
return mem; return mem;

11
gobject/gatomicarray.h
View File

@ -27,7 +27,16 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define G_ATOMIC_ARRAY_DATA_SIZE(mem) (*((gsize *) (mem) - 1)) typedef union _GAtomicArrayMetadata
{
gsize size;
/* We have to ensure that the memory location is sufficiently aligned to
* store any object. With C11 this would be max_align_t, but in practise
* gpointer is sufficient for all known architectures. We could change
* this to `_Alignas(max_align_t) char pad` once we depend on C11. */
gpointer _alignment_padding;
} GAtomicArrayMetadata;
#define G_ATOMIC_ARRAY_DATA_SIZE(mem) (((GAtomicArrayMetadata *) (mem) - 1)->size)
typedef struct _GAtomicArray GAtomicArray; typedef struct _GAtomicArray GAtomicArray;
struct _GAtomicArray { struct _GAtomicArray {