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: 15-May-2014 00:42:44
Branch: rpm-5_4 Handle: 2014051422424300
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmpgp.c
Log:
- coverity #1214094
Summary:
Revision Changes Path
2.127.2.12 +6 -4 rpm/rpmio/rpmpgp.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.c
============================================================================
$ cvs diff -u -r2.127.2.11 -r2.127.2.12 rpmpgp.c
--- rpm/rpmio/rpmpgp.c 5 May 2014 19:16:30 -0000 2.127.2.11
+++ rpm/rpmio/rpmpgp.c 14 May 2014 22:42:43 -0000 2.127.2.12
@@ -768,7 +768,7 @@
}
}
if (i == 0) {
- pgpPrtHex(" Curve = [ OID]:", p+1, p[0]);
+ pgpPrtHex("Curve = [ OID]:", p+1, p[0]);
pgpPrtNL();
p += p[0] + 1;
pgpPrtStr(pgpPublicECDSA[i], pgpMpiStr(p));
@@ -789,12 +789,12 @@
}
}
if (i == 0) {
- pgpPrtHex(" Curve = [ OID]:", p+1, p[0]);
+ pgpPrtHex("Curve = [ OID]:", p+1, p[0]);
p += p[0] + 1;
pgpPrtNL();
pgpPrtStr(pgpPublicECDH[i], pgpMpiStr(p));
p += pgpMpiLen(p);
- pgpPrtHex(" KDF params:", p+1, p[0]);
+ pgpPrtHex(" KDF params:", p+1, p[0]);
p += p[0] + 1;
pgpPrtNL();
break; /* XXX FIXME: early exit */
@@ -1213,8 +1213,10 @@
int rc = 0;
t = rpmExpand("%{?_build_sign}", NULL);
- if (!(t && *t))
+ if (!(t && *t)) {
+ t = _free(t); /* coverity #1214094 */
t = xstrdup("DSA");
+ }
dig->build_sign = t;
if ((te = strrchr(t, '/')) != NULL)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
