Handle empty X509_NAME in printing routines.

diff --git a/CHANGES b/CHANGES
index 748f0f86543e1dc0d7f32a4969cc5d3585e2276d..47582d5b4a123bf7e1b99b5801d38894b7b879ed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.6a and 0.9.6b  [XX xxx XXXX]
 
+  *) Handle special case when X509_NAME is empty in X509 printing routines.
+     [Steve Henson]
+
   *) In dsa_do_verify (crypto/dsa/dsa_ossl.c), verify that r and s are
      positive and less than q.
      [Bodo Moeller]

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index 6a3ba8eb154322c11965af2ac8af49c4f91d9675..f0271fdfa148d3d3ba25741ba262512bb59d53a3 100644 (file)
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -214,6 +214,8 @@ int i;
                }
        else
                p=buf;
+       if (i == 0)
+               *p = '\0';
        return(p);
 err:
        X509err(X509_F_X509_NAME_ONELINE,ERR_R_MALLOC_FAILURE);