X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fnames-parse.c;h=c86f8af3462f158b9ffabadffaf2dff1bcf1481a;hb=9001c06d1e15c9e0325d6036a0bb38fb1460239d;hp=58ab578e0e9f2d1775fb2f75a7ce49f74bb17155;hpb=90f8c88626289b0a713abc41759e8bebe6c20ddb;p=pciutils.git

diff --git a/lib/names-parse.c b/lib/names-parse.c
index 58ab578..c86f8af 100644
--- a/lib/names-parse.c
+++ b/lib/names-parse.c
@@ -30,7 +30,7 @@ static pci_file pci_open(struct pci_access *a)
   if (result)
     return result;
   len = strlen(a->id_file_name);
-  if (len >= 3 && memcmp(a->id_file_name + len - 3, ".gz", 3) != 0)
+  if (len < 3 || memcmp(a->id_file_name + len - 3, ".gz", 3) != 0)
     return result;
   new_name = malloc(len - 2);
   memcpy(new_name, a->id_file_name, len - 3);
@@ -42,7 +42,7 @@ static pci_file pci_open(struct pci_access *a)
 #define pci_close(f)		gzclose(f)
 #define PCI_ERROR(f, err)						\
 	if (!err) {							\
-		int errnum;						\
+		int errnum = 0;						\
 		gzerror(f, &errnum);					\
 		if (errnum >= 0) err = NULL;				\
 		else if (errnum == Z_ERRNO) err = "I/O error";		\
@@ -238,6 +238,7 @@ pci_free_name_list(struct pci_access *a)
 {
   pci_id_cache_flush(a);
   pci_id_hash_free(a);
+  pci_id_hwdb_free(a);
   a->id_load_failed = 0;
 }