fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 06:40:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared: assert against buffer length in nm_sprintf_buf()

Browse source
This commit is contained in:
Thomas Haller 2016-10-08 19:03:16 +02:00
parent ed93c168cf
commit c5f4e36fd9
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shared/nm-utils/nm-macros-internal.h
View file

@ -646,23 +646,27 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro) {
#define nm_sprintf_buf(buf, format, ...) ({ \
char * _buf = (buf); \
int _buf_len; \
\
/* some static assert trying to ensure that the buffer is statically allocated.
* It disallows a buffer size of sizeof(gpointer) to catch that. */ \
G_STATIC_ASSERT (G_N_ELEMENTS (buf) == sizeof (buf) && sizeof (buf) != sizeof (char *)); \
g_snprintf (_buf, sizeof (buf), \
""format"", ##__VA_ARGS__); \
_buf_len = g_snprintf (_buf, sizeof (buf), \
""format"", ##__VA_ARGS__); \
nm_assert (_buf_len < sizeof (buf)); \
_buf; \
})
#define nm_sprintf_bufa(n_elements, format, ...) \
({ \
char *_buf; \
int _buf_len; \
\
G_STATIC_ASSERT (sizeof (char[MAX ((n_elements), 1)]) == (n_elements)); \
_buf = g_alloca (n_elements); \
g_snprintf (_buf, n_elements, \
""format"", ##__VA_ARGS__); \
_buf_len = g_snprintf (_buf, (n_elements), \
""format"", ##__VA_ARGS__); \
nm_assert (_buf_len < (n_elements)); \
_buf; \
})