trivial: Fix critical warning when running fwupd as non-root

This commit is contained in:
Richard Hughes 2021-05-18 10:18:44 +01:00
parent 1a328fd3ad
commit 3ba0b29ba3
2 changed files with 8 additions and 3 deletions

View File

@ -454,7 +454,10 @@ const gchar *
fu_context_lookup_quirk_by_id (FuContext *self, const gchar *guid, const gchar *key) fu_context_lookup_quirk_by_id (FuContext *self, const gchar *guid, const gchar *key)
{ {
FuContextPrivate *priv = GET_PRIVATE (self); FuContextPrivate *priv = GET_PRIVATE (self);
g_return_val_if_fail (FU_IS_CONTEXT (self), NULL); g_return_val_if_fail (FU_IS_CONTEXT (self), NULL);
g_return_val_if_fail (guid != NULL, NULL);
g_return_val_if_fail (key != NULL, NULL);
/* exact ID */ /* exact ID */
return fu_quirks_lookup_by_id (priv->quirks, guid, key); return fu_quirks_lookup_by_id (priv->quirks, guid, key);

View File

@ -113,10 +113,12 @@ fu_plugin_startup (FuPlugin *plugin, GError **error)
const gchar *vendor = fu_context_get_hwid_replace_value (ctx, const gchar *vendor = fu_context_get_hwid_replace_value (ctx,
FU_HWIDS_KEY_MANUFACTURER, FU_HWIDS_KEY_MANUFACTURER,
NULL); NULL);
if (vendor != NULL) {
battery_str = g_strdup (fu_context_lookup_quirk_by_id (ctx, battery_str = g_strdup (fu_context_lookup_quirk_by_id (ctx,
vendor, vendor,
FU_QUIRKS_BATTERY_THRESHOLD)); FU_QUIRKS_BATTERY_THRESHOLD));
} }
}
if (battery_str == NULL) if (battery_str == NULL)
minimum_battery = MINIMUM_BATTERY_PERCENTAGE_FALLBACK; minimum_battery = MINIMUM_BATTERY_PERCENTAGE_FALLBACK;
else else