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

shared: improve length check in nm_construct_name_a()

Browse source 
Refactor the check so that integer overflow cannot happen. Realistically,
it anyway couldn't happen, because _name is nowhere near the size of
G_MAXSIZE. Still, avoid such code. Also, the operands involved here are
constants, so the extra check can anyway be resolved at compile-time.
This commit is contained in:
Thomas Haller 2018-10-19 00:30:32 +02:00
parent 648c256b90
commit 39bd412d28
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1420,7 +1420,8 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro)
char *_buf2; \
\
nm_assert (_p_val_to_free && !*_p_val_to_free); \
if (NM_STRLEN (format) + _name_len < 200) \
if ( NM_STRLEN (format) < 200 \
&& _name_len < (gsize) (200 - NM_STRLEN (format))) \
_buf2 = nm_sprintf_bufa (NM_STRLEN (format) + _name_len, format, _name); \
else { \
_buf2 = g_strdup_printf (format, _name); \