diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-29 10:33:14 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-29 10:33:14 +0100 |
| commit | c1b3616485604f3fddfad9521cb8818cd8eece2b (patch) | |
| tree | e5ed317b0d86dcae783a9caf45415ba8be6d2ad1 /src | |
| parent | a524db35ac5c2099671d16318524e277e88631be (diff) | |
| parent | 90c93214efba0966274224a93a77d235d4f8c034 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'src')
| -rw-r--r-- | src/devices/wifi/nm-device-wifi.c | 3 | ||||
| -rw-r--r-- | src/dhcp/nm-dhcp-nettools.c | 2 | ||||
| -rw-r--r-- | src/platform/nm-linux-platform.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 65ba2bcc..98f9df25 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -1075,7 +1075,6 @@ static GPtrArray * ssids_options_to_ptrarray (GVariant *value, GError **error) { GPtrArray *ssids = NULL; - GVariant *v; const guint8 *bytes; gsize len; int num_ssids, i; @@ -1092,6 +1091,8 @@ ssids_options_to_ptrarray (GVariant *value, GError **error) if (num_ssids) { ssids = g_ptr_array_new_full (num_ssids, (GDestroyNotify) g_bytes_unref); for (i = 0; i < num_ssids; i++) { + gs_unref_variant GVariant *v = NULL; + v = g_variant_get_child_value (value, i); bytes = g_variant_get_fixed_array (v, &len, sizeof (guint8)); if (len > 32) { diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c index 1f76c64c..b4c0a451 100644 --- a/src/dhcp/nm-dhcp-nettools.c +++ b/src/dhcp/nm-dhcp-nettools.c @@ -1028,10 +1028,10 @@ dhcp4_event_handle (NMDhcpNettools *self, _LOGW ("selecting lease failed: %d", r); } break; + case N_DHCP4_CLIENT_EVENT_RETRACTED: case N_DHCP4_CLIENT_EVENT_EXPIRED: nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_EXPIRE, NULL, NULL); break; - case N_DHCP4_CLIENT_EVENT_RETRACTED: case N_DHCP4_CLIENT_EVENT_CANCELLED: nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL); break; diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 305ae52e..7abe4dfc 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -3937,6 +3937,7 @@ _nl_msg_new_address (int nlmsg_type, if ( family == AF_INET && nlmsg_type != RTM_DELADDR + && plen < 31 /* RFC 3021 */ && address && *((in_addr_t *) address) != 0) { in_addr_t broadcast; |