1 files changed, 7 insertions, 14 deletions

diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
index 7ed8f1fe31..a31e5a170b 100644
--- a/src/lib/libcrypto/bio/bss_conn.c
+++ b/src/lib/libcrypto/bio/bss_conn.c
@@ -147,8 +147,7 @@ conn_state(BIO *b, BIO_CONNECT *c)
                                                         *q = '\0';
                                                         break;
                                                 }
-                                        if (c->param_port != NULL)
-                                                free(c->param_port);
+                                        free(c->param_port);
                                         c->param_port = BUF_strdup(p);
                                 }
                         }
@@ -315,10 +314,8 @@ BIO_CONNECT_free(BIO_CONNECT *a)
         if (a == NULL)
                 return;
 
-        if (a->param_hostname != NULL)
-                free(a->param_hostname);
-        if (a->param_port != NULL)
-                free(a->param_port);
+        free(a->param_hostname);
+        free(a->param_port);
         free(a);
 }
 
@@ -469,12 +466,10 @@ conn_ctrl(BIO *b, int cmd, long num, void *ptr)
                 if (ptr != NULL) {
                         b->init = 1;
                         if (num == 0) {
-                                if (data->param_hostname != NULL)
-                                        free(data->param_hostname);
+                                free(data->param_hostname);
                                 data->param_hostname = BUF_strdup(ptr);
                         } else if (num == 1) {
-                                if (data->param_port != NULL)
-                                        free(data->param_port);
+                                free(data->param_port);
                                 data->param_port = BUF_strdup(ptr);
                         } else if (num == 2) {
                                 char buf[16];
@@ -482,8 +477,7 @@ conn_ctrl(BIO *b, int cmd, long num, void *ptr)
 
                                 snprintf(buf, sizeof buf, "%d.%d.%d.%d",
                                     p[0], p[1], p[2], p[3]);
-                                if (data->param_hostname != NULL)
-                                        free(data->param_hostname);
+                                free(data->param_hostname);
                                 data->param_hostname = BUF_strdup(buf);
                                 memcpy(&(data->ip[0]), ptr, 4);
                         } else if (num == 3) {
@@ -491,8 +485,7 @@ conn_ctrl(BIO *b, int cmd, long num, void *ptr)
 
                                 snprintf(buf, sizeof buf, "%d",
                                     *(int *)ptr);
-                                if (data->param_port != NULL)
-                                        free(data->param_port);
+                                free(data->param_port);
                                 data->param_port = BUF_strdup(buf);
                                 data->port= *(int *)ptr;
                         }