BUF_MEM_free() only has one parameter and it returns immediately
if it is NULL.
Index: src/crypto/asn1/a_d2i_fp.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c,v
retrieving revision 1.11
diff -u -p -d -r1.11 a_d2i_fp.c
--- src/crypto/asn1/a_d2i_fp.c 13 Jul 2014 11:10:20 -0000 1.11
+++ src/crypto/asn1/a_d2i_fp.c 22 Jul 2014 06:12:57 -0000
@@ -99,8 +99,7 @@ ASN1_d2i_bio(void *(*xnew)(void), d2i_of
ret = d2i(x, &p, len);
err:
- if (b != NULL)
- BUF_MEM_free(b);
+ BUF_MEM_free(b);
return (ret);
}
@@ -122,8 +121,7 @@ ASN1_item_d2i_bio(const ASN1_ITEM *it, B
ret = ASN1_item_d2i(x, &p, len, it);
err:
- if (b != NULL)
- BUF_MEM_free(b);
+ BUF_MEM_free(b);
return (ret);
}
@@ -265,7 +263,6 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
return off;
err:
- if (b != NULL)
- BUF_MEM_free(b);
+ BUF_MEM_free(b);
return -1;
}
Index: src/crypto/conf/conf_def.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/crypto/conf/conf_def.c,v
retrieving revision 1.28
diff -u -p -d -r1.28 conf_def.c
--- src/crypto/conf/conf_def.c 11 Jul 2014 15:38:03 -0000 1.28
+++ src/crypto/conf/conf_def.c 22 Jul 2014 06:13:02 -0000
@@ -412,14 +412,12 @@ again:
v = NULL;
}
}
- if (buff != NULL)
- BUF_MEM_free(buff);
+ BUF_MEM_free(buff);
free(section);
return (1);
err:
- if (buff != NULL)
- BUF_MEM_free(buff);
+ BUF_MEM_free(buff);
free(section);
if (line != NULL)
*line = eline;
@@ -614,8 +612,7 @@ str_copy(CONF *conf, char *section, char
return (1);
err:
- if (buf != NULL)
- BUF_MEM_free(buf);
+ BUF_MEM_free(buf);
return (0);
}
Index: src/crypto/txt_db/txt_db.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/crypto/txt_db/txt_db.c,v
retrieving revision 1.18
diff -u -p -d -r1.18 txt_db.c
--- src/crypto/txt_db/txt_db.c 11 Jul 2014 08:44:49 -0000 1.18
+++ src/crypto/txt_db/txt_db.c 22 Jul 2014 06:13:06 -0000
@@ -287,8 +287,7 @@ TXT_DB_write(BIO *out, TXT_DB *db)
ret = tot;
err:
- if (buf != NULL)
- BUF_MEM_free(buf);
+ BUF_MEM_free(buf);
return (ret);
}
Index: src/crypto/x509/by_dir.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/crypto/x509/by_dir.c,v
retrieving revision 1.32
diff -u -p -d -r1.32 by_dir.c
--- src/crypto/x509/by_dir.c 11 Jul 2014 08:44:49 -0000 1.32
+++ src/crypto/x509/by_dir.c 22 Jul 2014 06:13:08 -0000
@@ -200,8 +200,7 @@ free_dir(X509_LOOKUP *lu)
a = (BY_DIR *)lu->method_data;
if (a->dirs != NULL)
sk_BY_DIR_ENTRY_pop_free(a->dirs, by_dir_entry_free);
- if (a->buffer != NULL)
- BUF_MEM_free(a->buffer);
+ BUF_MEM_free(a->buffer);
free(a);
}
@@ -426,7 +425,6 @@ get_cert_by_subject(X509_LOOKUP *xl, int
}
}
finish:
- if (b != NULL)
- BUF_MEM_free(b);
+ BUF_MEM_free(b);
return (ok);
}
Index: src/crypto/x509/x509_obj.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/crypto/x509/x509_obj.c,v
retrieving revision 1.16
diff -u -p -d -r1.16 x509_obj.c
--- src/crypto/x509/x509_obj.c 11 Jul 2014 08:44:49 -0000 1.16
+++ src/crypto/x509/x509_obj.c 22 Jul 2014 06:13:08 -0000
@@ -173,7 +173,6 @@ X509_NAME_oneline(X509_NAME *a, char *bu
err:
X509err(X509_F_X509_NAME_ONELINE, ERR_R_MALLOC_FAILURE);
- if (b != NULL)
- BUF_MEM_free(b);
+ BUF_MEM_free(b);
return (NULL);
}
Index: src/ssl/d1_clnt.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/ssl/d1_clnt.c,v
retrieving revision 1.31
diff -u -p -d -r1.31 d1_clnt.c
--- src/ssl/d1_clnt.c 12 Jul 2014 22:33:39 -0000 1.31
+++ src/ssl/d1_clnt.c 22 Jul 2014 06:13:30 -0000
@@ -747,8 +747,7 @@ end:
s->in_handshake, NULL);
#endif
- if (buf != NULL)
- BUF_MEM_free(buf);
+ BUF_MEM_free(buf);
if (cb != NULL)
cb(s, SSL_CB_CONNECT_EXIT, ret);
return (ret);
Index: src/ssl/s23_clnt.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/ssl/s23_clnt.c,v
retrieving revision 1.31
diff -u -p -d -r1.31 s23_clnt.c
--- src/ssl/s23_clnt.c 11 Jul 2014 08:17:36 -0000 1.31
+++ src/ssl/s23_clnt.c 22 Jul 2014 06:13:33 -0000
@@ -278,8 +278,7 @@ ssl23_connect(SSL *s)
}
end:
s->in_handshake--;
- if (buf != NULL)
- BUF_MEM_free(buf);
+ BUF_MEM_free(buf);
if (cb != NULL)
cb(s, SSL_CB_CONNECT_EXIT, ret);
return (ret);
Index: src/ssl/s3_clnt.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/ssl/s3_clnt.c,v
retrieving revision 1.84
diff -u -p -d -r1.84 s3_clnt.c
--- src/ssl/s3_clnt.c 17 Jul 2014 11:32:21 -0000 1.84
+++ src/ssl/s3_clnt.c 22 Jul 2014 06:13:58 -0000
@@ -631,8 +631,7 @@ ssl3_connect(SSL *s)
}
end:
s->in_handshake--;
- if (buf != NULL)
- BUF_MEM_free(buf);
+ BUF_MEM_free(buf);
if (cb != NULL)
cb(s, SSL_CB_CONNECT_EXIT, ret);
return (ret);
Index: src/ssl/ssl_lib.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/ssl/ssl_lib.c,v
retrieving revision 1.78
diff -u -p -d -r1.78 ssl_lib.c
--- src/ssl/ssl_lib.c 12 Jul 2014 22:33:39 -0000 1.78
+++ src/ssl/ssl_lib.c 22 Jul 2014 06:14:25 -0000
@@ -503,8 +503,7 @@ SSL_free(SSL *s)
if ((s->wbio != NULL) && (s->wbio != s->rbio))
BIO_free_all(s->wbio);
- if (s->init_buf != NULL)
- BUF_MEM_free(s->init_buf);
+ BUF_MEM_free(s->init_buf);
/* add extra stuff */
if (s->cipher_list != NULL)
