diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-26 11:33:29 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-26 20:57:11 +0200 |
| commit | b5bcd3f656db4f09d14f51829d7e194a4ab66eaf (patch) | |
| tree | 5eea699d1649a547d5db7cd0bd0334e588791fbe | |
| parent | b837123729453de7258687ee65945cb2fd8f5334 (diff) | |
mbimcli: ensure 'cancellable' in Context is always initialized
As the Context struct is allocated via g_slice_new and its 'cancellable' field
is only set when a GCancellable is provided, there is no guarantee that the
cancellable field is always initialized. This patch fixes the code to always
initialize the cancellable field of the Context struct.
(cherry picked from commit 752855389c8fc7f23e74f2e9e4224dee4e28362d)
| -rw-r--r-- | src/mbimcli/mbimcli-basic-connect.c | 3 | ||||
| -rw-r--r-- | src/mbimcli/mbimcli-dss.c | 3 | ||||
| -rw-r--r-- | src/mbimcli/mbimcli-ms-firmware-id.c | 3 | ||||
| -rw-r--r-- | src/mbimcli/mbimcli-ms-host-shutdown.c | 3 | ||||
| -rw-r--r-- | src/mbimcli/mbimcli-phonebook.c | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/src/mbimcli/mbimcli-basic-connect.c b/src/mbimcli/mbimcli-basic-connect.c index d6317b2..329f582 100644 --- a/src/mbimcli/mbimcli-basic-connect.c +++ b/src/mbimcli/mbimcli-basic-connect.c @@ -1522,8 +1522,7 @@ mbimcli_basic_connect_run (MbimDevice *device, /* Initialize context */ ctx = g_slice_new (Context); ctx->device = g_object_ref (device); - if (cancellable) - ctx->cancellable = g_object_ref (cancellable); + ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL; /* Request to get capabilities? */ if (query_device_caps_flag) { diff --git a/src/mbimcli/mbimcli-dss.c b/src/mbimcli/mbimcli-dss.c index 6b2bfe6..044bf6d 100644 --- a/src/mbimcli/mbimcli-dss.c +++ b/src/mbimcli/mbimcli-dss.c @@ -257,8 +257,7 @@ mbimcli_dss_run (MbimDevice *device, /* Initialize context */ ctx = g_slice_new (Context); ctx->device = g_object_ref (device); - if (cancellable) - ctx->cancellable = g_object_ref (cancellable); + ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL; /* Connect? */ if (connect_str) { diff --git a/src/mbimcli/mbimcli-ms-firmware-id.c b/src/mbimcli/mbimcli-ms-firmware-id.c index 3563684..3fba3b0 100644 --- a/src/mbimcli/mbimcli-ms-firmware-id.c +++ b/src/mbimcli/mbimcli-ms-firmware-id.c @@ -153,8 +153,7 @@ mbimcli_ms_firmware_id_run (MbimDevice *device, /* Initialize context */ ctx = g_slice_new (Context); ctx->device = g_object_ref (device); - if (cancellable) - ctx->cancellable = g_object_ref (cancellable); + ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL; /* Request to get firmware ID? */ if (query_firmware_id_flag) { diff --git a/src/mbimcli/mbimcli-ms-host-shutdown.c b/src/mbimcli/mbimcli-ms-host-shutdown.c index 459b64d..c01c117 100644 --- a/src/mbimcli/mbimcli-ms-host-shutdown.c +++ b/src/mbimcli/mbimcli-ms-host-shutdown.c @@ -137,8 +137,7 @@ mbimcli_ms_host_shutdown_run (MbimDevice *device, /* Initialize context */ ctx = g_slice_new (Context); ctx->device = g_object_ref (device); - if (cancellable) - ctx->cancellable = g_object_ref (cancellable); + ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL; /* Request to notify that host is shutting down */ if (notify_host_shutdown_flag) { diff --git a/src/mbimcli/mbimcli-phonebook.c b/src/mbimcli/mbimcli-phonebook.c index f006fd4..6266494 100644 --- a/src/mbimcli/mbimcli-phonebook.c +++ b/src/mbimcli/mbimcli-phonebook.c @@ -353,8 +353,7 @@ mbimcli_phonebook_run (MbimDevice *device, /* Initialize context */ ctx = g_slice_new (Context); ctx->device = g_object_ref (device); - if (cancellable) - ctx->cancellable = g_object_ref (cancellable); + ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL; /* Request to get configuration? */ if (phonebook_configuration_flag) { |