Accept NULL in *_free.
diff --git a/CHANGES b/CHANGES
index 882b247..8bda119 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
Changes between 0.9.1c and 0.9.2
+ *) Make _all_ *_free functions accept a NULL pointer.
+ [Frans Heymans <fheymans@isaserver.be>]
+
*) If a DH key is generated in s3_srvr.c, don't blow it by trying to use
NULL pointers.
[Anonymous <nobody@replay.com>]
diff --git a/crypto/asn1/p7_lib.c b/crypto/asn1/p7_lib.c
index 06e1da4..4ab6477 100644
--- a/crypto/asn1/p7_lib.c
+++ b/crypto/asn1/p7_lib.c
@@ -267,6 +267,9 @@
void PKCS7_content_free(a)
PKCS7 *a;
{
+ if(a == NULL)
+ return;
+
if (a->asn1 != NULL) Free((char *)a->asn1);
if (a->d.ptr != NULL)
diff --git a/crypto/asn1/x_name.c b/crypto/asn1/x_name.c
index 3b8bc51..3af14c8 100644
--- a/crypto/asn1/x_name.c
+++ b/crypto/asn1/x_name.c
@@ -263,6 +263,9 @@
void X509_NAME_free(a)
X509_NAME *a;
{
+ if(a == NULL)
+ return;
+
BUF_MEM_free(a->bytes);
sk_pop_free(a->entries,X509_NAME_ENTRY_free);
Free((char *)a);
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 2c36150..402439c 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -310,6 +310,9 @@
{
int i;
+ if(a == NULL)
+ return;
+
if (a->h_aliases != NULL)
{
for (i=0; a->h_aliases[i] != NULL; i++)
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 872807d..ecdd170 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -173,6 +173,9 @@
void BIO_ACCEPT_free(a)
BIO_ACCEPT *a;
{
+ if(a == NULL)
+ return;
+
if (a->param_addr != NULL) Free(a->param_addr);
if (a->addr != NULL) Free(a->addr);
if (a->bio_chain != NULL) BIO_free(a->bio_chain);
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 3ec1388..b90fea1 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -357,6 +357,9 @@
void BIO_CONNECT_free(a)
BIO_CONNECT *a;
{
+ if(a == NULL)
+ return;
+
if (a->param_hostname != NULL)
Free(a->param_hostname);
if (a->param_port != NULL)
diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c
index 35be32b..c247f71 100644
--- a/crypto/bn/bn_blind.c
+++ b/crypto/bn/bn_blind.c
@@ -90,6 +90,9 @@
void BN_BLINDING_free(r)
BN_BLINDING *r;
{
+ if(r == NULL)
+ return;
+
if (r->A != NULL) BN_free(r->A );
if (r->Ai != NULL) BN_free(r->Ai);
Free(r);
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index c027d0b..d8d2c32 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -341,6 +341,9 @@
{
int i;
+ if(c == NULL)
+ return;
+
for (i=0; i<BN_CTX_NUM; i++)
BN_clear_free(&(c->bn[i]));
if (c->flags & BN_FLG_MALLOCED)
diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index a5640b5..2215dc3 100644
--- a/crypto/bn/bn_mont.c
+++ b/crypto/bn/bn_mont.c
@@ -289,6 +289,9 @@
void BN_MONT_CTX_free(mont)
BN_MONT_CTX *mont;
{
+ if(mont == NULL)
+ return;
+
BN_free(&(mont->RR));
BN_free(&(mont->N));
BN_free(&(mont->Ni));
diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c
index 97ca857..3ace566 100644
--- a/crypto/bn/bn_recp.c
+++ b/crypto/bn/bn_recp.c
@@ -84,6 +84,9 @@
void BN_RECP_CTX_free(recp)
BN_RECP_CTX *recp;
{
+ if(recp == NULL)
+ return;
+
BN_free(&(recp->N));
BN_free(&(recp->Nr));
if (recp->flags & BN_FLG_MALLOCED)
diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
index 7e8af9e..b160a74 100644
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -79,6 +79,9 @@
void BUF_MEM_free(a)
BUF_MEM *a;
{
+ if(a == NULL)
+ return;
+
if (a->data != NULL)
{
memset(a->data,0,(unsigned int)a->max);
diff --git a/crypto/comp/comp_lib.c b/crypto/comp/comp_lib.c
index 8ce0695..dcacb55 100644
--- a/crypto/comp/comp_lib.c
+++ b/crypto/comp/comp_lib.c
@@ -33,6 +33,9 @@
{
/* CRYPTO_free_ex_data(rsa_meth,(char *)ctx,&ctx->ex_data); */
+ if(ctx == NULL)
+ return;
+
if (ctx->meth->finish != NULL)
ctx->meth->finish(ctx);
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 5cf6218..39c997a 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -175,6 +175,9 @@
{
int i;
+ if(s == NULL)
+ return;
+
for (i=0; i<ERR_NUM_ERRORS; i++)
{
err_clear_data(s,i);
diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index ec143e8..b405050 100644
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -474,8 +474,7 @@
err:
BN_clear_free(&m1);
BN_clear_free(&r1);
- if(ctx)
- BN_CTX_free(ctx);
+ BN_CTX_free(ctx);
return(ret);
}
diff --git a/crypto/rsa/rsa_enc.c b/crypto/rsa/rsa_enc.c
index 5f91239..c4a4ad5 100644
--- a/crypto/rsa/rsa_enc.c
+++ b/crypto/rsa/rsa_enc.c
@@ -531,8 +531,7 @@
err:
if (m1 != NULL) BN_free(m1);
if (r1 != NULL) BN_free(r1);
- if(ctx != NULL)
- BN_CTX_free(ctx);
+ BN_CTX_free(ctx);
return(ret);
}
diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c
index e4259d9..dccb2b9 100644
--- a/crypto/txt_db/txt_db.c
+++ b/crypto/txt_db/txt_db.c
@@ -356,6 +356,9 @@
int i,n;
char **p,*max;
+ if(db == NULL)
+ return;
+
if (db->index != NULL)
{
for (i=db->num_fields-1; i>=0; i--)
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index deec5ad..8ea6819 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -259,6 +259,9 @@
STACK *sk;
X509_LOOKUP *lu;
+ if(vfy == NULL)
+ return;
+
sk=vfy->get_cert_methods;
for (i=0; i<sk_num(sk); i++)
{
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 51f6861..097c35e 100644
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -257,6 +257,9 @@
{
SSL2_CTX *s2;
+ if(s == NULL)
+ return;
+
s2=s->s2;
if (s2->rbuf != NULL) Free(s2->rbuf);
if (s2->wbuf != NULL) Free(s2->wbuf);
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 116b096..ea8e39e 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -208,6 +208,7 @@
p=s->s3->tmp.key_block;
i=EVP_MD_size(m);
+ // Should be j=exp?min(5,EVP_CIPHER_key_length(c)):EVP_CIPHER_key_length(c); ?? - Ben 30/12/98
j=(exp)?5:EVP_CIPHER_key_length(c);
k=EVP_CIPHER_iv_length(c);
if ( (which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index a523207..f15bb24 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -456,6 +456,9 @@
void ssl3_free(s)
SSL *s;
{
+ if(s == NULL)
+ return;
+
ssl3_cleanup_key_block(s);
if (s->s3->rbuf.buf != NULL)
Free(s->s3->rbuf.buf);
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 1bff91e..7d4531d 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -105,6 +105,9 @@
{
int i;
+ if(c == NULL)
+ return;
+
i=CRYPTO_add(&c->references,-1,CRYPTO_LOCK_SSL_CERT);
#ifdef REF_PRINT
REF_PRINT("CERT",c);
diff --git a/ssl/ssl_comp.c b/ssl/ssl_comp.c
index 7724ff5..1593afb 100644
--- a/ssl/ssl_comp.c
+++ b/ssl/ssl_comp.c
@@ -361,6 +361,9 @@
{
int i;
+ if(ss == NULL)
+ return;
+
i=CRYPTO_add(&ss->references,-1,CRYPTO_LOCK_SSL_SESSION);
#ifdef REF_PRINT
REF_PRINT("SSL_SESSION",ss);
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index e562330..9e578fd 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -203,6 +203,9 @@
{
int i;
+ if(s == NULL)
+ return;
+
i=CRYPTO_add(&s->references,-1,CRYPTO_LOCK_SSL);
#ifdef REF_PRINT
REF_PRINT("SSL",s);
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index d4978a7..95cd7fe 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -363,6 +363,9 @@
{
int i;
+ if(ss == NULL)
+ return;
+
i=CRYPTO_add(&ss->references,-1,CRYPTO_LOCK_SSL_SESSION);
#ifdef REF_PRINT
REF_PRINT("SSL_SESSION",ss);
