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

gsocket: Work around broken CMSG_FIRSTHDR()

Browse Source 
As RFC 2292 points out, some platforms (e.g. Darwin 9.8.0) provide
CMSG_FIRSTHDR(msg) which just returns msg.msg_control without first
checking if msg.msg_controllen is non-zero. We need a workaround for
such platforms not to let g_socket_receive_message() segfault.

https://bugzilla.gnome.org/show_bug.cgi?id=690388
This commit is contained in:
PHO 2012-12-18 08:33:50 +09:00 committed by Dan Winship
parent 780871d273
commit f0f6c8d231
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gsocket.c
View File

@ -4154,6 +4154,8 @@ g_socket_receive_message (GSocket *socket,
GPtrArray *my_messages = NULL; GPtrArray *my_messages = NULL;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
if (msg.msg_controllen >= sizeof (struct cmsghdr))
{
for (cmsg = CMSG_FIRSTHDR (&msg); cmsg; cmsg = CMSG_NXTHDR (&msg, cmsg)) for (cmsg = CMSG_FIRSTHDR (&msg); cmsg; cmsg = CMSG_NXTHDR (&msg, cmsg))
{ {
GSocketControlMessage *message; GSocketControlMessage *message;
@ -4181,6 +4183,7 @@ g_socket_receive_message (GSocket *socket,
g_ptr_array_add (my_messages, message); g_ptr_array_add (my_messages, message);
} }
} }
}
if (num_messages) if (num_messages)
*num_messages = my_messages != NULL ? my_messages->len : 0; *num_messages = my_messages != NULL ? my_messages->len : 0;