From: Martin Mares <mj@ucw.cz>
Date: Sun, 26 Dec 2021 20:52:37 +0000 (+0100)
Subject: HWDB: Handle NULL returned by udev_list_entry_get_*
X-Git-Tag: v3.8.0~98
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=ae833de28e16a9ec0144befa36affa2f4239a7c1;p=pciutils.git

HWDB: Handle NULL returned by udev_list_entry_get_*

Based on a patch by <lixiaokeng@huawei.com>.
---

diff --git a/lib/names-hwdb.c b/lib/names-hwdb.c
index 07b3499..171723b 100644
--- a/lib/names-hwdb.c
+++ b/lib/names-hwdb.c
@@ -71,8 +71,15 @@ pci_id_hwdb_lookup(struct pci_access *a, int cat, int id1, int id2, int id3, int
 
       struct udev_list_entry *entry;
       udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(a->id_udev_hwdb, modalias, 0))
-        if (strcmp(udev_list_entry_get_name(entry), key) == 0)
-    	  return pci_strdup(a, udev_list_entry_get_value(entry));
+	{
+	  const char *entry_name = udev_list_entry_get_name(entry);
+	  if (entry_name && !strcmp(entry_name, key))
+	    {
+	      const char *entry_value = udev_list_entry_get_value(entry);
+	      if (entry_value)
+		return pci_strdup(a, entry_value);
+	    }
+	}
     }
 
   return NULL;