diff options
| author | deraadt <> | 2014-05-30 06:22:57 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-05-30 06:22:57 +0000 |
| commit | 93efbaa11c9b941fe460a1f6bfa75b21d8624e53 (patch) | |
| tree | 1ff700d79cee9e764329e5c50d7eb8d5109789cc /src/lib/libcrypto/bio/bss_acpt.c | |
| parent | 4aef4566c1a41608b7d78a7d5cfc3e031b7e4fe3 (diff) | |
| download | openbsd-93efbaa11c9b941fe460a1f6bfa75b21d8624e53.tar.gz openbsd-93efbaa11c9b941fe460a1f6bfa75b21d8624e53.tar.bz2 openbsd-93efbaa11c9b941fe460a1f6bfa75b21d8624e53.zip | |
more: no need for null check before free
ok tedu guenther
Diffstat (limited to 'src/lib/libcrypto/bio/bss_acpt.c')
| -rw-r--r-- | src/lib/libcrypto/bio/bss_acpt.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c index 943d3d9d96..d246aba681 100644 --- a/src/lib/libcrypto/bio/bss_acpt.c +++ b/src/lib/libcrypto/bio/bss_acpt.c | |||
| @@ -148,10 +148,8 @@ BIO_ACCEPT_free(BIO_ACCEPT *a) | |||
| 148 | if (a == NULL) | 148 | if (a == NULL) |
| 149 | return; | 149 | return; |
| 150 | 150 | ||
| 151 | if (a->param_addr != NULL) | 151 | free(a->param_addr); |
| 152 | free(a->param_addr); | 152 | free(a->addr); |
| 153 | if (a->addr != NULL) | ||
| 154 | free(a->addr); | ||
| 155 | if (a->bio_chain != NULL) | 153 | if (a->bio_chain != NULL) |
| 156 | BIO_free(a->bio_chain); | 154 | BIO_free(a->bio_chain); |
| 157 | free(a); | 155 | free(a); |
| @@ -352,8 +350,7 @@ acpt_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 352 | if (ptr != NULL) { | 350 | if (ptr != NULL) { |
| 353 | if (num == 0) { | 351 | if (num == 0) { |
| 354 | b->init = 1; | 352 | b->init = 1; |
| 355 | if (data->param_addr != NULL) | 353 | free(data->param_addr); |
| 356 | free(data->param_addr); | ||
| 357 | data->param_addr = BUF_strdup(ptr); | 354 | data->param_addr = BUF_strdup(ptr); |
| 358 | } else if (num == 1) { | 355 | } else if (num == 1) { |
| 359 | data->accept_nbio = (ptr != NULL); | 356 | data->accept_nbio = (ptr != NULL); |
