luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 13:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'multicast-memcpy-size' into 'main'

Browse Source 
gsocket: Add assertions about socket address sizes for memcpy()

See merge request GNOME/glib!2625
This commit is contained in:
Sebastian Dröge 2022-04-27 14:32:16 +00:00
commit 0c1b7b263e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gsocket.c
View File

@ -2604,8 +2604,12 @@ g_socket_multicast_group_operation_ssm (GSocket *socket,
S_ADDR_FIELD(mc_req_src) = iface_addr->sin_addr.s_addr; S_ADDR_FIELD(mc_req_src) = iface_addr->sin_addr.s_addr;
#endif /* defined(G_OS_WIN32) && defined (HAVE_IF_NAMETOINDEX) */ #endif /* defined(G_OS_WIN32) && defined (HAVE_IF_NAMETOINDEX) */
} }
g_assert (g_inet_address_get_native_size (group) == sizeof (mc_req_src.imr_multiaddr));
memcpy (&mc_req_src.imr_multiaddr, g_inet_address_to_bytes (group), memcpy (&mc_req_src.imr_multiaddr, g_inet_address_to_bytes (group),
g_inet_address_get_native_size (group)); g_inet_address_get_native_size (group));
g_assert (g_inet_address_get_native_size (source_specific) == sizeof (mc_req_src.imr_sourceaddr));
memcpy (&mc_req_src.imr_sourceaddr, memcpy (&mc_req_src.imr_sourceaddr,
g_inet_address_to_bytes (source_specific), g_inet_address_to_bytes (source_specific),
g_inet_address_get_native_size (source_specific)); g_inet_address_get_native_size (source_specific));