Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 10:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LOG fixed https://bugs.launchpad.net/rpm/+bug/910708 (rpm -Va --nofiles Segmentation fault)

Browse source
This commit is contained in:
Anton Kirilenko 2012-04-11 16:02:56 +04:00
parent d5d753e187
commit 57e916b93f
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
rpm-5.3.12-fix-verify-segfault.patch Normal file
View file

@ -0,0 +1,26 @@
--- rpm-5.3.12/rpmio/rpmhkp.c 2010-10-12 01:56:41.000000000 +0400
+++ rpm-5.3.12/rpmio/rpmhkp.c 2012-03-29 12:56:02.322614316 +0400
@@ -878,6 +878,14 @@
rpmRC rpmhkpValidate(rpmhkp hkp, const char * keyname)
{
+ /*Reset all the temporary variables*/
+ hkp->pubx = -1;
+ hkp->uidx = -1;
+ hkp->subx = -1;
+ hkp->sigx = -1;
+ hkp->tvalid = 0;
+ hkp->uvalidx = -1;
+
pgpPkt pp = alloca(sizeof(*pp));
size_t pleft;
rpmRC rc = RPMRC_NOKEY; /* assume failure */
@@ -1055,7 +1063,7 @@
}
exit:
- if ((hkp->uidx >= 0 && hkp->uidx < hkp->npkts) && hkp->tvalid > 0) {
+ if ((hkp->uvalidx >= 0 && hkp->uvalidx < hkp->npkts) && hkp->tvalid > 0) {
char user[256+1];
size_t nuser;
pgpPktUid * u;

3
rpm.spec
View file

@ -92,6 +92,8 @@ Patch19: rpm-5.3.10-doxygen-1.7.4-bug.patch
Patch20: rpm-5.3.11-fix-syslog-b0rkage.patch
Patch21: rpm-5.3.12-change-dep-loop-errors-to-warnings.patch
Patch22: rpm-5.3.12-55810-rpmevrcmp-again-grf.patch
Patch23: rpm-5.3.12-fix-verify-segfault.patch
License: LGPLv2.1+
BuildRequires: autoconf >= 2.57 bzip2-devel automake >= 1.8 elfutils-devel
BuildRequires: sed >= 4.0.3 beecrypt-devel ed gettext-devel byacc
@ -275,6 +277,7 @@ This package contains the RPM API documentation generated in HTML format.
%patch20 -p1 -b .syslog~
%patch21 -p1 -b .loop_warnings~
%patch22 -p1 -b .55810~
%patch23 -p1 -b .verify-segfault~
mkdir -p cpu-os-macros
tar -zxf %{SOURCE3} -C cpu-os-macros