colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared: propagate types in nm_malloc_maybe_a(), nm_malloc0_maybe_a(), nm_memdup_maybe_a()

Browse Source 
The "to_free" pointer should have the suitable type that we are
requesting. Use "typeof()" to preserve and propagate the pointer
type in the macro.
This commit is contained in:
Thomas Haller
2019-05-16 08:05:15 +02:00
parent dc2ef4250e
commit d0e1d0e626
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shared/nm-glib-aux/nm-macros-internal.h
View File

@@ -1534,8 +1534,8 @@ nm_memdup (gconstpointer data, gsize size)
#define nm_malloc_maybe_a(alloca_maxlen, bytes, to_free) \ #define nm_malloc_maybe_a(alloca_maxlen, bytes, to_free) \
({ \ ({ \
const gsize _bytes = (bytes); \ const gsize _bytes = (bytes); \
gpointer _ptr; \
typeof (to_free) _to_free = (to_free); \ typeof (to_free) _to_free = (to_free); \
typeof (*_to_free) _ptr; \
\ \
G_STATIC_ASSERT_EXPR ((alloca_maxlen) <= 500); \ G_STATIC_ASSERT_EXPR ((alloca_maxlen) <= 500); \
nm_assert (_to_free && !*_to_free); \ nm_assert (_to_free && !*_to_free); \
@@ -1553,8 +1553,8 @@ nm_memdup (gconstpointer data, gsize size)
#define nm_malloc0_maybe_a(alloca_maxlen, bytes, to_free) \ #define nm_malloc0_maybe_a(alloca_maxlen, bytes, to_free) \
({ \ ({ \
const gsize _bytes = (bytes); \ const gsize _bytes = (bytes); \
gpointer _ptr; \
typeof (to_free) _to_free = (to_free); \ typeof (to_free) _to_free = (to_free); \
typeof (*_to_free) _ptr; \
\ \
G_STATIC_ASSERT_EXPR ((alloca_maxlen) <= 500); \ G_STATIC_ASSERT_EXPR ((alloca_maxlen) <= 500); \
nm_assert (_to_free && !*_to_free); \ nm_assert (_to_free && !*_to_free); \
@@ -1573,14 +1573,15 @@ nm_memdup (gconstpointer data, gsize size)
#define nm_memdup_maybe_a(alloca_maxlen, data, size, to_free) \ #define nm_memdup_maybe_a(alloca_maxlen, data, size, to_free) \
({ \ ({ \
const gsize _size = (size); \ const gsize _size = (size); \
gpointer _ptr_md = NULL; \
typeof (to_free) _to_free_md = (to_free); \ typeof (to_free) _to_free_md = (to_free); \
typeof (*(_to_free_md)) _data = (data); \
typeof (*(_to_free_md)) _ptr_md = NULL; \
\ \
nm_assert (_to_free_md && !*_to_free_md); \ nm_assert (_to_free_md && !*_to_free_md); \
\ \
if (_size > 0u) { \ if (_size > 0u) { \
_ptr_md = nm_malloc_maybe_a ((alloca_maxlen), _size, _to_free_md); \ _ptr_md = nm_malloc_maybe_a ((alloca_maxlen), _size, _to_free_md); \
memcpy (_ptr_md, (data), _size); \ memcpy (_ptr_md, _data, _size); \
} \ } \
\ \
_ptr_md; \ _ptr_md; \