[packages/rpm.git] / rpm-5.4.9-fix-verify-segfault.patch

--- rpm-5.4.9/rpmio/rpmhkp.c.fix_verify~	2012-04-16 22:53:33.000000000 +0200
+++ rpm-5.4.9/rpmio/rpmhkp.c	2012-05-15 03:51:08.805023846 +0200
@@ -901,6 +901,14 @@ char * t, * te;
 te = t = tbuf;
 *te = '\0';
 
+    /*Reset all the temporary variables*/
+    hkp->pubx = -1;
+    hkp->uidx = -1;
+    hkp->subx = -1;
+    hkp->sigx = -1;
+    hkp->tvalid = 0;
+    hkp->uvalidx = -1;
+
 HKPDEBUG((stderr, "--> %s(%p,%s)\n", __FUNCTION__, hkp, keyname));
 
     /* Do a lazy lookup before validating. */
@@ -1065,7 +1073,7 @@ SPEW((stderr, "\t%s\n", pgpHexStr(hkp->p
     }
 
 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;
Commit	Line	Data
70f8787d JR	1	--- rpm-5.4.9/rpmio/rpmhkp.c.fix_verify~ 2012-04-16 22:53:33.000000000 +0200
	2	+++ rpm-5.4.9/rpmio/rpmhkp.c 2012-05-15 03:51:08.805023846 +0200
	3	@@ -901,6 +901,14 @@ char * t, * te;
	4	te = t = tbuf;
	5	*te = '\0';
	6
	7	+ /Reset all the temporary variables/
	8	+ hkp->pubx = -1;
	9	+ hkp->uidx = -1;
	10	+ hkp->subx = -1;
	11	+ hkp->sigx = -1;
	12	+ hkp->tvalid = 0;
	13	+ hkp->uvalidx = -1;
	14	+
	15	HKPDEBUG((stderr, "--> %s(%p,%s)\n", __FUNCTION__, hkp, keyname));
	16
	17	/* Do a lazy lookup before validating. */
	18	@@ -1065,7 +1073,7 @@ SPEW((stderr, "\t%s\n", pgpHexStr(hkp->p
	19	}
	20
	21	exit:
	22	- if ((hkp->uidx >= 0 && hkp->uidx < hkp->npkts) && hkp->tvalid > 0) {
	23	+ if ((hkp->uvalidx >= 0 && hkp->uvalidx < hkp->npkts) && hkp->tvalid > 0) {
	24	char user[256+1];
	25	size_t nuser;
	26	pgpPktUid * u;