fix: lspci segfaults when pci.ids cannot be found (#487516)
This commit is contained in:
parent
1e2e54fe68
commit
a499713bb5
@ -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)))
|
if (!(f = pci_open(a)))
|
||||||
- return 0;
|
- return 0;
|
||||||
- err = id_parse_list(a, f, &lino);
|
- 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);
|
+ err = id_parse_list(a, f, &lino, 0);
|
||||||
PCI_ERROR(f, err);
|
PCI_ERROR(f, err);
|
||||||
pci_close(f);
|
pci_close(f);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Name: pciutils
|
Name: pciutils
|
||||||
Version: 3.1.2
|
Version: 3.1.2
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
|
Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
|
||||||
Patch1: pciutils-2.2.4-buf.patch
|
Patch1: pciutils-2.2.4-buf.patch
|
||||||
Patch2: pciutils-2.1.10-scan.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
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 27 2009 Michal Hlavinka <mhlaivnk@redhat.com> - 3.1.2-3
|
||||||
|
- fix: lspci segfaults when pci.ids cannot be found (#487516)
|
||||||
|
|
||||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.2-2
|
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.2-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user