Convert asn1_ex_c2i() to CBS.

This allows us to make direct use of c2i_ASN1_OBJECT_cbs().

ok inoguchi@ tb@

1 files changed, 7 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/a_object.c b/src/lib/libcrypto/asn1/a_object.c
index c6e4c77f92..c695499b31 100644
--- a/src/lib/libcrypto/asn1/a_object.c
+++ b/src/lib/libcrypto/asn1/a_object.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_object.c,v 1.46 2022/04/10 12:42:33 inoguchi Exp $ */
+/* $OpenBSD: a_object.c,v 1.47 2022/04/23 18:47:08 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -529,9 +529,14 @@ c2i_ASN1_OBJECT_cbs(ASN1_OBJECT **out_aobj, CBS *content)
         size_t data_len;
         CBS cbs;
 
-        if (out_aobj == NULL || *out_aobj != NULL)
+        if (out_aobj == NULL)
                 goto err;
 
+        if (*out_aobj != NULL) {
+                ASN1_OBJECT_free(*out_aobj);
+                *out_aobj = NULL;
+        }
+
         /* Parse and validate OID encoding per X.690 8.19.2. */
         CBS_dup(content, &cbs);
         if (CBS_len(&cbs) == 0) {