RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 16-Feb-2015 22:44:27
Branch: rpm-5_4 Handle: 2015021621442700
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmhkp.c
Log:
- hkp: fix: reset state iff pointer is non-null.
Summary:
Revision Changes Path
2.20.2.10 +8 -8 rpm/rpmio/rpmhkp.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmhkp.c
============================================================================
$ cvs diff -u -r2.20.2.9 -r2.20.2.10 rpmhkp.c
--- rpm/rpmio/rpmhkp.c 11 Oct 2014 12:56:41 -0000 2.20.2.9
+++ rpm/rpmio/rpmhkp.c 16 Feb 2015 21:44:27 -0000 2.20.2.10
@@ -916,14 +916,6 @@
HKPDEBUG((stderr, "--> %s(%p,%s)\n", __FUNCTION__, hkp, keyname));
- /* Reset temporary variables*/
- hkp->pubx = -1;
- hkp->uidx = -1;
- hkp->subx = -1;
- hkp->sigx = -1;
- hkp->tvalid = 0;
- hkp->uvalidx = -1;
-
/* Do a lazy lookup before validating. */
if (hkp == NULL && keyname && *keyname) {
if ((hkp = rpmhkpLookup(keyname)) == NULL) {
@@ -934,6 +926,14 @@
if ((hkp = rpmhkpLink(hkp)) == NULL)
return rc;
+ /* Reset temporary variables*/
+ hkp->pubx = -1;
+ hkp->uidx = -1;
+ hkp->subx = -1;
+ hkp->sigx = -1;
+ hkp->tvalid = 0;
+ hkp->uvalidx = -1;
+
SUM.certs++;
assert(hkp->pkts);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
