summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-05-19 16:55:48 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-05-19 16:55:48 +0200
commitd60cca10cbcfed0e19baa515b3bacd5d6c5d9c6f (patch)
treebd6f95f695d36e5d9601932a048c1f0f66e1e207
parent9e7a4d6684970120e478ab095a377cc3e278b1bb (diff)
parent0c82322dcabf4e6d2a0f7d9ee24e5911ba02bafc (diff)
downloadabrt-d60cca10cbcfed0e19baa515b3bacd5d6c5d9c6f.tar.gz
abrt-d60cca10cbcfed0e19baa515b3bacd5d6c5d9c6f.tar.xz
abrt-d60cca10cbcfed0e19baa515b3bacd5d6c5d9c6f.zip
Merge branch 'master' of ssh://vda@git.fedorahosted.org/git/abrt
-rw-r--r--src/Daemon/RPM.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Daemon/RPM.cpp b/src/Daemon/RPM.cpp
index c40f9a07..50b03482 100644
--- a/src/Daemon/RPM.cpp
+++ b/src/Daemon/RPM.cpp
@@ -28,6 +28,8 @@ CRPM::CRPM()
CRPM::~CRPM()
{
+ rpmFreeCrypto();
+ rpmFreeRpmrc();
rpmcliFini(m_poptContext);
}
@@ -48,6 +50,7 @@ void CRPM::LoadOpenGPGPublicKey(const char* pFileName)
if (fedoraFingerprint != NULL)
{
m_setFingerprints.insert(fedoraFingerprint);
+ free(fedoraFingerprint);
}
}
free(pkt);
@@ -71,6 +74,7 @@ bool CRPM::CheckFingerprint(const char* pPackage)
rpmtd td = rpmtdNew();
headerGet(header, rpmTags[ii] , td, HEADERGET_DEFAULT);
char* pgpsig = rpmtdFormat(td, RPMTD_FORMAT_PGPSIG , NULL);
+ rpmtdFree(td);
if (pgpsig)
{
std::string PGPSignatureText = pgpsig;
@@ -81,7 +85,6 @@ bool CRPM::CheckFingerprint(const char* pPackage)
{
std::string headerFingerprint = PGPSignatureText.substr(Key_ID_pos + sizeof (" Key ID ") - 1);
- rpmtdFree(td);
if (headerFingerprint != "")
{
if (m_setFingerprints.find(headerFingerprint) != m_setFingerprints.end())