Fix memory leaks in rpmGetSubkeys() and pgpPrtParamsSubkeys()

cms-externals · Mar 8, 2016 · cc61141 · cc61141
1 parent 468726e
commit cc61141
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/rpmio/rpmkeyring.c b/rpmio/rpmkeyring.c
@@ -177,6 +177,7 @@ rpmPubkey *rpmGetSubkeys(rpmPubkey mainkey, int *count)
 	    subkey->nrefs = 1;
 	    pthread_rwlock_init(&subkey->lock, NULL);
 	}
+	free(pgpsubkeys);
     }
     *count = pgpsubkeysCount;
 

diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
@@ -1022,8 +1022,10 @@ int pgpPrtParamsSubkeys(const uint8_t *pkts, size_t pktlen,
 	    /* Copy UID from main key to subkey */
 	    digps[count]->userid = xstrdup(mainkey->userid);
 
-	    if(getFingerprint(pkt.body, pkt.blen, digps[count]->signid))
+	    if(getFingerprint(pkt.body, pkt.blen, digps[count]->signid)) {
+		pgpDigParamsFree(digps[count]);
 		continue;
+	    }
 
 	    if(pgpPrtKey(pkt.tag, pkt.body, pkt.blen, digps[count])) {
 		pgpDigParamsFree(digps[count]);