From a499713bb572ab6e1f2ee072b5903d11b744a6f3 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 27 Feb 2009 19:36:28 +0000 Subject: [PATCH] fix: lspci segfaults when pci.ids cannot be found (#487516) --- pciutils-dir-d.patch | 2 +- pciutils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pciutils-dir-d.patch b/pciutils-dir-d.patch index 88abe4a..1a24150 100644 --- a/pciutils-dir-d.patch +++ b/pciutils-dir-d.patch @@ -39,7 +39,7 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c if (!(f = pci_open(a))) - return 0; - err = id_parse_list(a, f, &lino); -+ pci_new_load_name_list(a); ++ return eci_new_load_name_list(a); + err = id_parse_list(a, f, &lino, 0); PCI_ERROR(f, err); pci_close(f); diff --git a/pciutils.spec b/pciutils.spec index b40bb2c..af52682 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,6 +1,6 @@ Name: pciutils Version: 3.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz Patch1: pciutils-2.2.4-buf.patch Patch2: pciutils-2.1.10-scan.patch @@ -112,6 +112,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 27 2009 Michal Hlavinka - 3.1.2-3 +- fix: lspci segfaults when pci.ids cannot be found (#487516) + * Thu Feb 26 2009 Fedora Release Engineering - 3.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild