From de7003e4c3e55c31deb17bdaccc20f3dbe0c1281 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Wed, 2 Sep 2026 07:15:01 +0000
Subject: asn1_multi: slightly improve order of variable declarations and
 freeing

---
 src/lib/libcrypto/asn1/asn1_gen.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/libcrypto/asn1/asn1_gen.c b/src/lib/libcrypto/asn1/asn1_gen.c
index 1bec75bba5..bb58843bbf 100644
--- a/src/lib/libcrypto/asn1/asn1_gen.c
+++ b/src/lib/libcrypto/asn1/asn1_gen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_gen.c,v 1.34 2026/09/02 07:11:55 tb Exp $ */
+/* $OpenBSD: asn1_gen.c,v 1.35 2026/09/02 07:15:01 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2002.
  */
@@ -436,10 +436,10 @@ parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
 static ASN1_TYPE *
 asn1_multi(int utype, const char *section, X509V3_CTX *cnf)
 {
-	ASN1_TYPE *ret = NULL, *typ = NULL;
-	ASN1_STRING *astr = NULL;
 	STACK_OF(ASN1_TYPE) *sk = NULL;
 	STACK_OF(CONF_VALUE) *sect = NULL;
+	ASN1_TYPE *ret = NULL, *typ = NULL;
+	ASN1_STRING *astr = NULL;
 	unsigned char *der = NULL;
 	int derlen;
 	int i;
@@ -489,10 +489,10 @@ asn1_multi(int utype, const char *section, X509V3_CTX *cnf)
 	typ = NULL;
 
  err:
-	free(der);
 	sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free);
 	ASN1_TYPE_free(typ);
 	ASN1_STRING_free(astr);
+	free(der);
 
 	return ret;
 }
-- 
cgit v1.2.3-55-g6feb