From b111f62b9eb16103fc3d98415ba9776b81bcc906 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Mon, 21 Sep 2020 05:20:20 +0000
Subject: Move freeing and zeroing up to right after the while loop.

Requested by jsing
---
 src/lib/libcrypto/x509/x509_constraints.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/libcrypto/x509/x509_constraints.c b/src/lib/libcrypto/x509/x509_constraints.c
index f50a55c6ac..caf56af045 100644
--- a/src/lib/libcrypto/x509/x509_constraints.c
+++ b/src/lib/libcrypto/x509/x509_constraints.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_constraints.c,v 1.8 2020/09/20 19:13:06 tb Exp $ */
+/* $OpenBSD: x509_constraints.c,v 1.9 2020/09/21 05:20:20 tb Exp $ */
 /*
  * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
  *
@@ -767,14 +767,14 @@ x509_constraints_extract_names(struct x509_constraints_names *names,
 		}
 		vname = NULL;
 	}
+
+	x509_constraints_name_free(vname);
+	vname = NULL;
+
 	subject_name = X509_get_subject_name(cert);
 	if (X509_NAME_entry_count(subject_name) > 0) {
 		X509_NAME_ENTRY *email;
 		X509_NAME_ENTRY *cn;
-
-		x509_constraints_name_free(vname);
-		vname = NULL;
-
 		/*
 		 * This cert has a non-empty subject, so we must add
 		 * the subject as a dirname to be compared against
-- 
cgit v1.2.3-55-g6feb