import of OpenSSL 0.9.8h

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libcrypto/x509/x509_r2x.c b/src/lib/libcrypto/x509/x509_r2x.c
index fb8a78dabe..254a14693d 100644
--- a/src/lib/libcrypto/x509/x509_r2x.c
+++ b/src/lib/libcrypto/x509/x509_r2x.c
@@ -89,8 +89,10 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
                 }
 
         xn=X509_REQ_get_subject_name(r);
-        X509_set_subject_name(ret,X509_NAME_dup(xn));
-        X509_set_issuer_name(ret,X509_NAME_dup(xn));
+        if (X509_set_subject_name(ret,X509_NAME_dup(xn)) == 0)
+                goto err;
+        if (X509_set_issuer_name(ret,X509_NAME_dup(xn)) == 0)
+                goto err;
 
         if (X509_gmtime_adj(xi->validity->notBefore,0) == NULL)
                 goto err;