Merge branch 'element-size-morello' into 'master'

dbus-mempool.c: Ensure element_size is at least sizeof(void *)

See merge request dbus/dbus!318
This commit is contained in:
Simon McVittie 2022-05-23 12:13:26 +00:00
commit d7007915cc

View file

@ -149,7 +149,9 @@ _dbus_mem_pool_new (int element_size,
/* Make the element size at least 8 bytes. */
if (element_size < 8)
element_size = 8;
if (element_size < (int) sizeof (void *))
element_size = sizeof (void *);
/* these assertions are equivalent but the first is more clear
* to programmers that see it fail.
*/