From b24615d8018c7cd78a744db0372c09c07543b763 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 13 May 2025 10:33:07 -0500 Subject: [PATCH] log-object: don't construct log ID with NULL self_id If the object has an owner ID already but doesn't yet have enough information to build its log ID, don't cache a less-than-useful log ID string for it. Signed-off-by: Dan Williams --- src/mm-log-object.c | 2 +- src/mm-port.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mm-log-object.c b/src/mm-log-object.c index b5e390f1..64e4b407 100644 --- a/src/mm-log-object.c +++ b/src/mm-log-object.c @@ -63,7 +63,7 @@ mm_log_object_get_id (MMLogObject *self) gchar *self_id; self_id = MM_LOG_OBJECT_GET_IFACE (self)->build_id (self); - if (priv->owner_id) { + if (self_id && priv->owner_id) { priv->id = g_strdup_printf ("%s/%s", priv->owner_id, self_id); g_free (self_id); } else diff --git a/src/mm-port.c b/src/mm-port.c index da37f902..7102770d 100644 --- a/src/mm-port.c +++ b/src/mm-port.c @@ -132,6 +132,9 @@ log_object_build_id (MMLogObject *_self) MMPort *self; self = MM_PORT (_self); + if (!self->priv->device || !self->priv->ptype) + return NULL; + return g_strdup_printf ("%s/%s", mm_port_get_device (self), mm_port_type_get_string (mm_port_get_port_type (self)));