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: 03-Apr-2016 22:47:49 Branch: rpm-5_4 Handle: 2016040320474800 Modified files: (Branch: rpm-5_4) rpm/lib rpmchecksig.c Log: - consitent checks for rpmhkpLoad* error returns. Summary: Revision Changes Path 1.240.2.17 +3 -3 rpm/lib/rpmchecksig.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/rpmchecksig.c ============================================================================ $ cvs diff -u -r1.240.2.16 -r1.240.2.17 rpmchecksig.c --- rpm/lib/rpmchecksig.c 3 Apr 2016 20:43:05 -0000 1.240.2.16 +++ rpm/lib/rpmchecksig.c 3 Apr 2016 20:47:48 -0000 1.240.2.17 @@ -567,7 +567,7 @@ memcpy(pubp->signid, hkp->keyid, sizeof(pubp->signid)); /* XXX useless */ if (pgpPktLen(hkp->pkt, hkp->pktlen, pp) < 0 - || rpmhkpLoadKey(hkp, dig, 0, 0)) + || rpmhkpLoadKey(hkp, dig, 0, 0) < 0) goto exit; /* Validate pubkey self-signatures. */ @@ -1153,7 +1153,7 @@ he->tag = she->tag; if (!headerGet(sigh, he, 0) || pgpPktLen(he->p.ui8p, he->c, pp) < 0 - || rpmhkpLoadSignature(NULL, dig, pp)) + || rpmhkpLoadSignature(NULL, dig, pp) < 0) { he->p.ptr = _free(he->p.ptr); goto exit; @@ -1208,7 +1208,7 @@ continue; if (pgpPktLen(she->p.ui8p, she->c, pp) < 0 - || rpmhkpLoadSignature(NULL, dig, pp) + || rpmhkpLoadSignature(NULL, dig, pp) < 0 || (sigp->version != 3 && sigp->version != 4)) { rpmlog(RPMLOG_ERR, @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org