[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  7cb1ecec59d7c8d6628fb9bfd435306f7e06fd33 (commit)
      from  27ed73a98f88c98be996a6ffe7bda1b84bfc8be7 (commit)


- Log -----------------------------------------------------------------
commit 7cb1ecec59d7c8d6628fb9bfd435306f7e06fd33
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Tue Sep 27 23:36:37 2016 +0200

    Allow null in  X509_CRL_METHOD_free
    
    and fix documentation.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1634)

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509/x_crl.c   | 2 +-
 doc/man3/X509_dup.pod | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c
index f94d04c..a5871ca 100644
--- a/crypto/x509/x_crl.c
+++ b/crypto/x509/x_crl.c
@@ -441,7 +441,7 @@ X509_CRL_METHOD *X509_CRL_METHOD_new(int (*crl_init) (X509_CRL *crl),
 
 void X509_CRL_METHOD_free(X509_CRL_METHOD *m)
 {
-    if (!(m->flags & X509_CRL_METHOD_DYNAMIC))
+    if (m == NULL || !(m->flags & X509_CRL_METHOD_DYNAMIC))
         return;
     OPENSSL_free(m);
 }
diff --git a/doc/man3/X509_dup.pod b/doc/man3/X509_dup.pod
index d704962..7406a68 100644
--- a/doc/man3/X509_dup.pod
+++ b/doc/man3/X509_dup.pod
@@ -207,8 +207,6 @@ X509_CINF_free,
 X509_CINF_new,
 X509_CRL_INFO_free,
 X509_CRL_INFO_new,
-X509_CRL_METHOD_free,
-X509_CRL_METHOD_new,
 X509_CRL_dup,
 X509_CRL_free,
 X509_CRL_new,