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

Fix non-initialized variable and remove obsolete usage of inet_addr in gio/gsocket.c

Browse Source
This commit is contained in:
Loic Le Page 2022-01-19 18:58:17 +01:00 committed by Philip Withnall
parent 7bde242707
commit bf68e8606b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gsocket.c
View File

@ -2228,7 +2228,7 @@ g_socket_w32_get_adapter_ipv4_addr (const gchar *name_or_ip)
unsigned int malloc_iterations = 0; unsigned int malloc_iterations = 0;
PIP_ADAPTER_ADDRESSES addr_buf = NULL, eth_adapter; PIP_ADAPTER_ADDRESSES addr_buf = NULL, eth_adapter;
wchar_t *wchar_name_or_ip = NULL; wchar_t *wchar_name_or_ip = NULL;
gulong ip_result; gulong ip_result = 0;
NET_IFINDEX if_index; NET_IFINDEX if_index;
/* /*
@ -2247,8 +2247,7 @@ g_socket_w32_get_adapter_ipv4_addr (const gchar *name_or_ip)
*/ */
/* Step 1: Check if string is an IP address: */ /* Step 1: Check if string is an IP address: */
ip_result = inet_addr (name_or_ip); if (inet_pton (AF_INET, name_or_ip, &ip_result) == 1)
if (ip_result != INADDR_NONE)
return ip_result; /* Success, IP address string was given directly */ return ip_result; /* Success, IP address string was given directly */
/* /*
@ -3887,7 +3886,7 @@ update_condition_unlocked (GSocket *socket)
if (socket->priv->current_events & FD_CLOSE) if (socket->priv->current_events & FD_CLOSE)
{ {
int r, errsv, buffer; int r, errsv = NO_ERROR, buffer;
r = recv (socket->priv->fd, &buffer, sizeof (buffer), MSG_PEEK); r = recv (socket->priv->fd, &buffer, sizeof (buffer), MSG_PEEK);
if (r < 0) if (r < 0)