From 09235289c377ff998964bb6b074bb2a3ad768fd2 Mon Sep 17 00:00:00 2001
From: PW Hu <jlu.hpw@foxmail.com>
Date: Fri, 5 Nov 2021 17:16:03 +0800
Subject: [PATCH] Fix: invoking x509_name_cannon improperly

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16974)
---
 crypto/x509/x_name.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index d5ef8e3408..bed2d049b4 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -219,8 +219,8 @@ static int x509_name_ex_i2d(const ASN1_VALUE **val, unsigned char **out,
         if (ret < 0)
             return ret;
         ret = x509_name_canon(a);
-        if (ret < 0)
-            return ret;
+        if (!ret)
+            return -1;
     }
     ret = a->bytes->length;
     if (out != NULL) {