proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-29 22:14:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not crash when there are no devices to return

Browse Source
This commit is contained in:
Richard Hughes 2015-03-17 20:58:46 +00:00
parent 7c3485bc1b
commit 9a38c03fe2
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fu-main.c
View File

@ -137,11 +137,20 @@ fu_main_set_status (FuMainPrivate *priv, FuStatus status)
* fu_main_device_array_to_variant: * fu_main_device_array_to_variant:
**/ **/
static GVariant * static GVariant *
fu_main_device_array_to_variant (FuMainPrivate *priv) fu_main_device_array_to_variant (FuMainPrivate *priv, GError **error)
{ {
GVariantBuilder builder; GVariantBuilder builder;
guint i; guint i;
/* no devices */
if (priv->devices->len == 0) {
g_set_error_literal (error,
FU_ERROR,
FU_ERROR_NOTHING_TO_DO,
"no supported devices");
return NULL;
}
g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY); g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
for (i = 0; i < priv->devices->len; i++) { for (i = 0; i < priv->devices->len; i++) {
GVariant *tmp; GVariant *tmp;
@ -456,9 +465,14 @@ fu_main_daemon_method_call (GDBusConnection *connection, const gchar *sender,
/* return 'as' */ /* return 'as' */
if (g_strcmp0 (method_name, "GetDevices") == 0) { if (g_strcmp0 (method_name, "GetDevices") == 0) {
_cleanup_error_free_ GError *error = NULL;
_cleanup_strv_free_ gchar **devices = NULL; _cleanup_strv_free_ gchar **devices = NULL;
g_debug ("Called %s()", method_name); g_debug ("Called %s()", method_name);
val = fu_main_device_array_to_variant (priv); val = fu_main_device_array_to_variant (priv, &error);
if (val == NULL) {
g_dbus_method_invocation_return_gerror (invocation, error);
return;
}
g_dbus_method_invocation_return_value (invocation, val); g_dbus_method_invocation_return_value (invocation, val);
fu_main_set_status (priv, FU_STATUS_IDLE); fu_main_set_status (priv, FU_STATUS_IDLE);
return; return;