luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 09:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'posix-memalign-zero' into 'main'

Browse Source 
gvariant-core: Don’t call posix_memalign() with size==0

See merge request GNOME/glib!3831
This commit is contained in:
Marco Trevisan 2024-01-16 18:52:21 +00:00
commit 1b32e72073
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gvariant-core.c
View File

@ -625,8 +625,14 @@ g_variant_new_from_bytes (const GVariantType *type,
/* posix_memalign() requires the alignment to be a multiple of
* sizeof(void*), and a power of 2. See g_variant_type_info_query() for
* details on the alignment format. */
if (posix_memalign (&aligned_data, MAX (sizeof (void *), alignment + 1),
* details on the alignment format.
*
* While calling posix_memalign() with aligned_size==0 is safe on glibc,
* POSIX specifies that the behaviour is implementation-defined, so avoid
* that and leave aligned_data==NULL in that case.
* See https://pubs.opengroup.org/onlinepubs/9699919799/functions/posix_memalign.html */
if (aligned_size != 0 &&
posix_memalign (&aligned_data, MAX (sizeof (void *), alignment + 1),
aligned_size) != 0)
g_error ("posix_memalign failed");

17
glib/tests/gvariant.c
View File

@ -1337,19 +1337,22 @@ flavoured_free (gpointer data,
static gpointer
align_malloc (gsize size)
{
gpointer mem;
gpointer mem = NULL;
#ifdef HAVE_POSIX_MEMALIGN
/* posix_memalign() requires the alignment to be a multiple of
* sizeof(void*), and a power of 2. */
if (posix_memalign (&mem, MAX (sizeof (void *), 8), size))
* sizeof(void*), and a power of 2.
* Calling it with size==0 leads to implementation-defined behaviour, so avoid
* that and guarantee to return NULL. */
if (size != 0 &&
posix_memalign (&mem, MAX (sizeof (void *), 8), size))
g_error ("posix_memalign failed");
#else
/* NOTE: there may be platforms that lack posix_memalign() and also
* have malloc() that returns non-8-aligned. if so, we need to try
* harder here.
*/
mem = malloc (size);
mem = (size > 0) ? malloc (size) : NULL;
#endif
return mem;
@ -4959,6 +4962,12 @@ test_gbytes (void)
g_bytes_unref (bytes2);
g_variant_unref (a);
g_variant_unref (tuple);
bytes = g_bytes_new (NULL, 0);
a = g_variant_new_from_bytes (G_VARIANT_TYPE ("as"), bytes, TRUE);
g_bytes_unref (bytes);
g_assert_cmpuint (g_variant_n_children (a), ==, 0);
g_variant_unref (a);
}
typedef struct {