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

Another fix on g_socket_send_message()

Browse Source 
We forgot to take into account the case where num_vectors is '-1'.
This commit is contained in:
Emmanuel Fleury
2021-01-13 13:23:40 +01:00
parent 5f11206237
commit b6f7e4678b
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gio/gsocket.c
View File

@@ -4784,18 +4784,37 @@ g_socket_send_message (GSocket *socket,
gsize bytes_written = 0; gsize bytes_written = 0;
gsize vectors_size = 0; gsize vectors_size = 0;
for (gsize i = 0; i < num_vectors; i++) if (num_vectors != -1)
{ {
/* No wrap-around for vectors_size */ for (gint i = 0; i < num_vectors; i++)
if (vectors_size > vectors_size + vectors[i].size)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, /* No wrap-around for vectors_size */
_("Unable to send message: %s"), if (vectors_size > vectors_size + vectors[i].size)
_("Message vectors too large")); {
return -1; g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
} _("Unable to send message: %s"),
_("Message vectors too large"));
return -1;
}
vectors_size += vectors[i].size; vectors_size += vectors[i].size;
}
}
else
{
for (gsize i = 0; vectors[i].buffer != NULL; i++)
{
/* No wrap-around for vectors_size */
if (vectors_size > vectors_size + vectors[i].size)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Unable to send message: %s"),
_("Message vectors too large"));
return -1;
}
vectors_size += vectors[i].size;
}
} }
/* Check if vector's buffers are too big for gssize */ /* Check if vector's buffers are too big for gssize */