diff options
Diffstat (limited to 'src/lib/libcrypto/bio')
-rw-r--r-- | src/lib/libcrypto/bio/b_sock.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_acpt.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_conn.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 8c37a3e175..ced0406bc1 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: b_sock.c,v 1.54 2014/07/11 08:44:47 jsing Exp $ */ | 1 | /* $OpenBSD: b_sock.c,v 1.55 2014/07/13 16:03:09 beck Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -235,7 +235,7 @@ BIO_get_accept_socket(char *host, int bind_mode) | |||
235 | unsigned long l; | 235 | unsigned long l; |
236 | int err_num; | 236 | int err_num; |
237 | 237 | ||
238 | if ((str = BUF_strdup(host)) == NULL) | 238 | if (host == NULL || (str = strdup(host)) == NULL) |
239 | return (-1); | 239 | return (-1); |
240 | 240 | ||
241 | h = p = NULL; | 241 | h = p = NULL; |
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c index c0316a2999..65d4bb2547 100644 --- a/src/lib/libcrypto/bio/bss_acpt.c +++ b/src/lib/libcrypto/bio/bss_acpt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_acpt.c,v 1.23 2014/07/11 08:44:47 jsing Exp $ */ | 1 | /* $OpenBSD: bss_acpt.c,v 1.24 2014/07/13 16:03:09 beck Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -354,7 +354,7 @@ acpt_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
354 | if (num == 0) { | 354 | if (num == 0) { |
355 | b->init = 1; | 355 | b->init = 1; |
356 | free(data->param_addr); | 356 | free(data->param_addr); |
357 | data->param_addr = BUF_strdup(ptr); | 357 | data->param_addr = strdup(ptr); |
358 | } else if (num == 1) { | 358 | } else if (num == 1) { |
359 | data->accept_nbio = (ptr != NULL); | 359 | data->accept_nbio = (ptr != NULL); |
360 | } else if (num == 2) { | 360 | } else if (num == 2) { |
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 8049f5c3f0..5120dabcb5 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_conn.c,v 1.29 2014/07/11 08:44:47 jsing Exp $ */ | 1 | /* $OpenBSD: bss_conn.c,v 1.30 2014/07/13 16:03:09 beck Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -152,7 +152,7 @@ conn_state(BIO *b, BIO_CONNECT *c) | |||
152 | break; | 152 | break; |
153 | } | 153 | } |
154 | free(c->param_port); | 154 | free(c->param_port); |
155 | c->param_port = BUF_strdup(p); | 155 | c->param_port = strdup(p); |
156 | } | 156 | } |
157 | } | 157 | } |
158 | 158 | ||
@@ -471,10 +471,10 @@ conn_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
471 | b->init = 1; | 471 | b->init = 1; |
472 | if (num == 0) { | 472 | if (num == 0) { |
473 | free(data->param_hostname); | 473 | free(data->param_hostname); |
474 | data->param_hostname = BUF_strdup(ptr); | 474 | data->param_hostname = strdup(ptr); |
475 | } else if (num == 1) { | 475 | } else if (num == 1) { |
476 | free(data->param_port); | 476 | free(data->param_port); |
477 | data->param_port = BUF_strdup(ptr); | 477 | data->param_port = strdup(ptr); |
478 | } else if (num == 2) { | 478 | } else if (num == 2) { |
479 | unsigned char *p = ptr; | 479 | unsigned char *p = ptr; |
480 | free(data->param_hostname); | 480 | free(data->param_hostname); |