diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-08-31 11:08:28 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-08-31 11:08:28 +0200 |
| commit | b51f06ff71a2060925bf3c0f04c44bd12480e670 (patch) | |
| tree | fd305682823aff144f345fd1d439fa78f3d51a0a /clients/cloud-setup | |
| parent | b92fc658301eb82b80167a31179c9b839f151b18 (diff) | |
| parent | e7b44ef4c80907346ec7492a09c45277459924fc (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'clients/cloud-setup')
| -rw-r--r-- | clients/cloud-setup/nm-http-client.c | 2 | ||||
| -rw-r--r-- | clients/cloud-setup/nmcs-provider-ec2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c index 946ed8ce..b4260ffe 100644 --- a/clients/cloud-setup/nm-http-client.c +++ b/clients/cloud-setup/nm-http-client.c @@ -438,8 +438,8 @@ _poll_get_probe_finish_fcn (GObject *source, _nm_unused gs_unref_object GTask *task = poll_get_data->task; /* balance ref from _poll_get_probe_start_fcn() */ gboolean success; gs_free_error GError *local_error = NULL; - long response_code; gs_unref_bytes GBytes *response_data = NULL; + long response_code = -1; success = nm_http_client_get_finish (g_task_get_source_object (poll_get_data->task), result, diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c index c8db31f9..3b5f6d36 100644 --- a/clients/cloud-setup/nmcs-provider-ec2.c +++ b/clients/cloud-setup/nmcs-provider-ec2.c @@ -487,7 +487,7 @@ _get_config_metadata_ready_check (long response_code, if (!response_parsed) response_parsed = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free); - mac_data = g_malloc (sizeof (GetConfigMetadataData) + 1 + p_start_l); + mac_data = g_malloc (sizeof (GetConfigMetadataMac) + 1 + p_start_l); mac_data->iface_idx = iface_idx_counter++; memcpy (mac_data->path, p_start, p_start_l); mac_data->path[p_start_l] = '\0'; |