Merge pull request #582 from smallstep/josh/fix-extra-capi-context-free

joshdrake · web-flow · commit 32782fa5e453 · 2024-08-30T13:41:23.000-05:00
Remove extraneous 'CertFreeCertificateContext' in capi.
diff --git a/kms/capi/capi.go b/kms/capi/capi.go
@@ -791,7 +791,6 @@ func (k *CAPIKMS) DeleteCertificate(req *apiv1.DeleteCertificateRequest) error {
 		if certHandle == nil {
 			return nil
 		}
-		defer windows.CertFreeCertificateContext(certHandle)
 
 		if err := windows.CertDeleteCertificateFromStore(certHandle); err != nil {
 			return fmt.Errorf("failed removing certificate: %w", err)
@@ -822,7 +821,6 @@ func (k *CAPIKMS) DeleteCertificate(req *apiv1.DeleteCertificateRequest) error {
 		if certHandle == nil {
 			return nil
 		}
-		defer windows.CertFreeCertificateContext(certHandle)
 
 		if err := windows.CertDeleteCertificateFromStore(certHandle); err != nil {
 			return fmt.Errorf("failed removing certificate: %w", err)
@@ -862,10 +860,10 @@ func (k *CAPIKMS) DeleteCertificate(req *apiv1.DeleteCertificateRequest) error {
 			if certHandle == nil {
 				return nil
 			}
-			defer windows.CertFreeCertificateContext(certHandle)
 
 			x509Cert, err := certContextToX509(certHandle)
 			if err != nil {
+				defer windows.CertFreeCertificateContext(certHandle)
 				return fmt.Errorf("could not unmarshal certificate to DER: %w", err)
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -791,7 +791,6 @@ func (k CAPIKMS) DeleteCertificate(req apiv1.DeleteCertificateRequest) error {`
`791`	`791`	`if certHandle == nil {`
`792`	`792`	`return nil`
`793`	`793`	`}`
`794`		`- defer windows.CertFreeCertificateContext(certHandle)`
`795`	`794`
`796`	`795`	`if err := windows.CertDeleteCertificateFromStore(certHandle); err != nil {`
`797`	`796`	`return fmt.Errorf("failed removing certificate: %w", err)`
`@@ -822,7 +821,6 @@ func (k CAPIKMS) DeleteCertificate(req apiv1.DeleteCertificateRequest) error {`
`822`	`821`	`if certHandle == nil {`
`823`	`822`	`return nil`
`824`	`823`	`}`
`825`		`- defer windows.CertFreeCertificateContext(certHandle)`
`826`	`824`
`827`	`825`	`if err := windows.CertDeleteCertificateFromStore(certHandle); err != nil {`
`828`	`826`	`return fmt.Errorf("failed removing certificate: %w", err)`
`@@ -862,10 +860,10 @@ func (k CAPIKMS) DeleteCertificate(req apiv1.DeleteCertificateRequest) error {`
`862`	`860`	`if certHandle == nil {`
`863`	`861`	`return nil`
`864`	`862`	`}`
`865`		`- defer windows.CertFreeCertificateContext(certHandle)`
`866`	`863`
`867`	`864`	`x509Cert, err := certContextToX509(certHandle)`
`868`	`865`	`if err != nil {`
	`866`	`+ defer windows.CertFreeCertificateContext(certHandle)`
`869`	`867`	`return fmt.Errorf("could not unmarshal certificate to DER: %w", err)`
`870`	`868`	`}`
`871`	`869`