diff options
| author | jsing <> | 2014-06-07 14:40:55 +0000 |
|---|---|---|
| committer | jsing <> | 2014-06-07 14:40:55 +0000 |
| commit | 369f4c90b9a7f7864572479745455d29b0777219 (patch) | |
| tree | 1e6f6808476d05bde0be8a0a5a86289f551b4ccb /src | |
| parent | cc3db42372df8be9ddfe6036931b6254f311e2b4 (diff) | |
| download | openbsd-369f4c90b9a7f7864572479745455d29b0777219.tar.gz openbsd-369f4c90b9a7f7864572479745455d29b0777219.tar.bz2 openbsd-369f4c90b9a7f7864572479745455d29b0777219.zip | |
Remove another NULL check before a BIO_free().
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/s3_lib.c | 8 | ||||
| -rw-r--r-- | src/lib/libssl/src/ssl/s3_lib.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 3058b66a0d..d6ceeee72d 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
| @@ -2377,10 +2377,10 @@ ssl3_clear(SSL *s) | |||
| 2377 | rlen = s->s3->rbuf.len; | 2377 | rlen = s->s3->rbuf.len; |
| 2378 | wlen = s->s3->wbuf.len; | 2378 | wlen = s->s3->wbuf.len; |
| 2379 | init_extra = s->s3->init_extra; | 2379 | init_extra = s->s3->init_extra; |
| 2380 | if (s->s3->handshake_buffer) { | 2380 | |
| 2381 | BIO_free(s->s3->handshake_buffer); | 2381 | BIO_free(s->s3->handshake_buffer); |
| 2382 | s->s3->handshake_buffer = NULL; | 2382 | s->s3->handshake_buffer = NULL; |
| 2383 | } | 2383 | |
| 2384 | ssl3_free_digest_list(s); | 2384 | ssl3_free_digest_list(s); |
| 2385 | 2385 | ||
| 2386 | memset(s->s3, 0, sizeof *s->s3); | 2386 | memset(s->s3, 0, sizeof *s->s3); |
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c index 3058b66a0d..d6ceeee72d 100644 --- a/src/lib/libssl/src/ssl/s3_lib.c +++ b/src/lib/libssl/src/ssl/s3_lib.c | |||
| @@ -2377,10 +2377,10 @@ ssl3_clear(SSL *s) | |||
| 2377 | rlen = s->s3->rbuf.len; | 2377 | rlen = s->s3->rbuf.len; |
| 2378 | wlen = s->s3->wbuf.len; | 2378 | wlen = s->s3->wbuf.len; |
| 2379 | init_extra = s->s3->init_extra; | 2379 | init_extra = s->s3->init_extra; |
| 2380 | if (s->s3->handshake_buffer) { | 2380 | |
| 2381 | BIO_free(s->s3->handshake_buffer); | 2381 | BIO_free(s->s3->handshake_buffer); |
| 2382 | s->s3->handshake_buffer = NULL; | 2382 | s->s3->handshake_buffer = NULL; |
| 2383 | } | 2383 | |
| 2384 | ssl3_free_digest_list(s); | 2384 | ssl3_free_digest_list(s); |
| 2385 | 2385 | ||
| 2386 | memset(s->s3, 0, sizeof *s->s3); | 2386 | memset(s->s3, 0, sizeof *s->s3); |