Remove an unnecessary call to BN_CTX_free.

dev-aaront-org · t8m · commit 94468c775c8e · 2020-04-03T10:42:14.000+02:00
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from openssl#11452)
diff --git a/crypto/ec/ec_check.c b/crypto/ec/ec_check.c
@@ -19,12 +19,12 @@
 int EC_GROUP_check_named_curve(const EC_GROUP *group, int nist_only,
                                BN_CTX *ctx)
 {
-    int nid = NID_undef;
+    int nid;
     BN_CTX *new_ctx = NULL;
 
     if (group == NULL) {
         ECerr(0, ERR_R_PASSED_NULL_PARAMETER);
-        goto err;
+        return NID_undef;
     }
 
     if (ctx == NULL) {
@@ -39,7 +39,6 @@ int EC_GROUP_check_named_curve(const EC_GROUP *group, int nist_only,
     if (nid > 0 && nist_only && EC_curve_nid2nist(nid) == NULL)
         nid = NID_undef;
 
-err:
     BN_CTX_free(new_ctx);
     return nid;
 }

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@`
`19`	`19`	`int EC_GROUP_check_named_curve(const EC_GROUP *group, int nist_only,`
`20`	`20`	`BN_CTX *ctx)`
`21`	`21`	`{`
`22`		`- int nid = NID_undef;`
	`22`	`+ int nid;`
`23`	`23`	`BN_CTX *new_ctx = NULL;`
`24`	`24`
`25`	`25`	`if (group == NULL) {`
`26`	`26`	`ECerr(0, ERR_R_PASSED_NULL_PARAMETER);`
`27`		`- goto err;`
	`27`	`+ return NID_undef;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`if (ctx == NULL) {`
`@@ -39,7 +39,6 @@ int EC_GROUP_check_named_curve(const EC_GROUP *group, int nist_only,`
`39`	`39`	`if (nid > 0 && nist_only && EC_curve_nid2nist(nid) == NULL)`
`40`	`40`	`nid = NID_undef;`
`41`	`41`
`42`		`-err:`
`43`	`42`	`BN_CTX_free(new_ctx);`
`44`	`43`	`return nid;`
`45`	`44`	`}`