PKCS7 trust store: properly clean certificates

smuellerDD · smuellerDD · commit a559a4a04c41 · 2025-01-11T23:50:55.000+01:00
Signed-off-by: Stephan Mueller &lt;smueller@chronox.de&gt;
diff --git a/asn1/src/pkcs7_trust.c b/asn1/src/pkcs7_trust.c
@@ -338,7 +338,7 @@ LC_INTERFACE_FUNCTION(int, lc_pkcs7_trust_store_add,
 LC_INTERFACE_FUNCTION(void, lc_pkcs7_trust_store_clear,
 		      struct lc_pkcs7_trust_store *trust_store)
 {
-	struct lc_x509_certificate *anchor_cert;
+	struct lc_x509_certificate *anchor_cert, *tmp;
 
 	if (!trust_store) {
 		/* Trust store is empty, nothing to do */
@@ -348,8 +348,8 @@ LC_INTERFACE_FUNCTION(void, lc_pkcs7_trust_store_clear,
 	anchor_cert = trust_store->anchor_cert;
 
 	while (anchor_cert) {
-		lc_x509_cert_clear(anchor_cert);
-
+		tmp = anchor_cert;
 		anchor_cert = anchor_cert->next;
+		lc_x509_cert_clear(tmp);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ LC_INTERFACE_FUNCTION(int, lc_pkcs7_trust_store_add,`
`338`	`338`	`LC_INTERFACE_FUNCTION(void, lc_pkcs7_trust_store_clear,`
`339`	`339`	`struct lc_pkcs7_trust_store *trust_store)`
`340`	`340`	`{`
`341`		`- struct lc_x509_certificate *anchor_cert;`
	`341`	`+ struct lc_x509_certificate anchor_cert, tmp;`
`342`	`342`
`343`	`343`	`if (!trust_store) {`
`344`	`344`	`/* Trust store is empty, nothing to do */`
`@@ -348,8 +348,8 @@ LC_INTERFACE_FUNCTION(void, lc_pkcs7_trust_store_clear,`
`348`	`348`	`anchor_cert = trust_store->anchor_cert;`
`349`	`349`
`350`	`350`	`while (anchor_cert) {`
`351`		`- lc_x509_cert_clear(anchor_cert);`
`352`		`-`
	`351`	`+ tmp = anchor_cert;`
`353`	`352`	`anchor_cert = anchor_cert->next;`
	`353`	`+ lc_x509_cert_clear(tmp);`
`354`	`354`	`}`
`355`	`355`	`}`