diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-06-07 14:14:14 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-06-07 14:14:14 +0000 |
| commit | a1f3877c5bad2222410b66958b21bd376cf3da49 (patch) | |
| tree | 0bd493669c0c933ed3cefd71f311a303eccf5b76 | |
| parent | 8ddc6a0deda01216cb77e6589eac26b54f2d8382 (diff) | |
ssl3_release_{read,write}_buffer() handle being called with NULL buffers,
so do not bother checking before calling.
| -rw-r--r-- | lib/libssl/src/ssl/s3_lib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libssl/src/ssl/s3_lib.c b/lib/libssl/src/ssl/s3_lib.c index d8066720f9e..5ed0aee7d56 100644 --- a/lib/libssl/src/ssl/s3_lib.c +++ b/lib/libssl/src/ssl/s3_lib.c @@ -2328,10 +2328,9 @@ ssl3_free(SSL *s) #endif ssl3_cleanup_key_block(s); - if (s->s3->rbuf.buf != NULL) - ssl3_release_read_buffer(s); - if (s->s3->wbuf.buf != NULL) - ssl3_release_write_buffer(s); + ssl3_release_read_buffer(s); + ssl3_release_write_buffer(s); + free(s->s3->rrec.comp); DH_free(s->s3->tmp.dh); EC_KEY_free(s->s3->tmp.ecdh); |