From d7237ca63a1497fc06a975639331ea7869b02c1a Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 22 Apr 2021 15:08:04 +0200 Subject: [PATCH] cov: add checks to prevent NULL dereference --- lib/device/device_id.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/device/device_id.c b/lib/device/device_id.c index 1a9705f04..9fd22692c 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c @@ -523,7 +523,7 @@ int device_ids_read(struct cmd_context *cmd) _copy_idline_str(line, _devices_file_systemid, sizeof(_devices_file_systemid)); log_debug("read devices file systemid %s", _devices_file_systemid); if ((!cmd->system_id && _devices_file_systemid[0]) || - strcmp(cmd->system_id, _devices_file_systemid)) { + (cmd->system_id && strcmp(cmd->system_id, _devices_file_systemid))) { log_warn("WARNING: ignoring devices file with wrong system id %s vs local %s.", _devices_file_systemid[0] ? _devices_file_systemid : "none", cmd->system_id ?: "none"); free_dus(&cmd->use_devices); @@ -1077,7 +1077,8 @@ id_done: if (du_devid && (du_devid != du_dev)) { log_warn("WARNING: device %s (%s) and %s (%s) have duplicate device ID.", dev_name(dev), id->idname, - du_pvid->dev ? dev_name(du_pvid->dev) : "none", du_pvid->idname); + (du_pvid && du_pvid->dev) ? dev_name(du_pvid->dev) : "none", + du_pvid ? du_pvid->idname : ""); } if (du_pvid && (du_pvid != du_dev)) {