proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-15 01:08:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Fix potential critical when converting empty object to GVariant

Browse Source
This commit is contained in:
Richard Hughes 2019-03-21 17:04:38 +00:00
parent 705402cebd
commit 8356a83c4a
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfwupd/fwupd-client.c
View File

@ -994,7 +994,7 @@ fwupd_client_install (FwupdClient *client,
return FALSE; return FALSE;
/* set options */ /* set options */
g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
"reason", g_variant_new_string ("user-action")); "reason", g_variant_new_string ("user-action"));
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
@ -1491,7 +1491,7 @@ fwupd_client_self_sign (FwupdClient *client,
return NULL; return NULL;
/* set options */ /* set options */
g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
if (flags & FWUPD_SELF_SIGN_FLAG_ADD_TIMESTAMP) { if (flags & FWUPD_SELF_SIGN_FLAG_ADD_TIMESTAMP) {
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
"add-timestamp", g_variant_new_boolean (TRUE)); "add-timestamp", g_variant_new_boolean (TRUE));

2
libfwupd/fwupd-device.c
View File

@ -1093,7 +1093,7 @@ fwupd_device_to_variant_full (FwupdDevice *device, FwupdDeviceFlags flags)
g_return_val_if_fail (FWUPD_IS_DEVICE (device), NULL); g_return_val_if_fail (FWUPD_IS_DEVICE (device), NULL);
/* create an array with all the metadata in */ /* create an array with all the metadata in */
g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
if (priv->id != NULL) { if (priv->id != NULL) {
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
FWUPD_RESULT_KEY_DEVICE_ID, FWUPD_RESULT_KEY_DEVICE_ID,

2
libfwupd/fwupd-release.c
View File

@ -991,7 +991,7 @@ fwupd_release_to_variant (FwupdRelease *release)
g_return_val_if_fail (FWUPD_IS_RELEASE (release), NULL); g_return_val_if_fail (FWUPD_IS_RELEASE (release), NULL);
/* create an array with all the metadata in */ /* create an array with all the metadata in */
g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
if (priv->remote_id != NULL) { if (priv->remote_id != NULL) {
g_variant_builder_add (&builder, "{sv}", g_variant_builder_add (&builder, "{sv}",
FWUPD_RESULT_KEY_REMOTE_ID, FWUPD_RESULT_KEY_REMOTE_ID,

2
libfwupd/fwupd-remote.c
View File

@ -1022,7 +1022,7 @@ fwupd_remote_to_variant (FwupdRemote *self)
g_return_val_if_fail (FWUPD_IS_REMOTE (self), NULL); g_return_val_if_fail (FWUPD_IS_REMOTE (self), NULL);
/* create an array with all the metadata in */ /* create an array with all the metadata in */
g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
if (priv->id != NULL) { if (priv->id != NULL) {
g_variant_builder_add (&builder, "{sv}", FWUPD_RESULT_KEY_REMOTE_ID, g_variant_builder_add (&builder, "{sv}", FWUPD_RESULT_KEY_REMOTE_ID,
g_variant_new_string (priv->id)); g_variant_new_string (priv->id));

2
src/fu-main.c
View File

@ -148,7 +148,7 @@ fu_main_emit_property_changed (FuMainPrivate *priv,
/* build the dict */ /* build the dict */
g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as")); g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));
g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
g_variant_builder_add (&builder, g_variant_builder_add (&builder,
"{sv}", "{sv}",
property_name, property_name,