summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_both.c
diff options
context:
space:
mode:
authorjsing <>2014-05-28 13:03:25 +0000
committerjsing <>2014-05-28 13:03:25 +0000
commit5e9669b813b32f5d5ca2ccb554e53000bd5a44d2 (patch)
tree60af46eb8cb0fcb0e51840739e416c98c124d73c /src/lib/libssl/s3_both.c
parent7bcea0bcb0bff06b137f084c63c8bdfc7299b84a (diff)
downloadopenbsd-5e9669b813b32f5d5ca2ccb554e53000bd5a44d2.tar.gz
openbsd-5e9669b813b32f5d5ca2ccb554e53000bd5a44d2.tar.bz2
openbsd-5e9669b813b32f5d5ca2ccb554e53000bd5a44d2.zip
There is no point in checking if a pointer is non-NULL before calling free,
since free already does this for us. Also remove some pointless NULL assignments, where the result from malloc(3) is immediately assigned to the same variable. ok miod@
Diffstat (limited to 'src/lib/libssl/s3_both.c')
-rw-r--r--src/lib/libssl/s3_both.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c
index 9dcdd7b998..f1d686b56f 100644
--- a/src/lib/libssl/s3_both.c
+++ b/src/lib/libssl/s3_both.c
@@ -719,20 +719,16 @@ ssl3_setup_buffers(SSL *s)
719int 719int
720ssl3_release_write_buffer(SSL *s) 720ssl3_release_write_buffer(SSL *s)
721{ 721{
722 if (s->s3->wbuf.buf != NULL) { 722 free(s->s3->wbuf.buf);
723 free(s->s3->wbuf.buf); 723 s->s3->wbuf.buf = NULL;
724 s->s3->wbuf.buf = NULL;
725 }
726 return 1; 724 return 1;
727} 725}
728 726
729int 727int
730ssl3_release_read_buffer(SSL *s) 728ssl3_release_read_buffer(SSL *s)
731{ 729{
732 if (s->s3->rbuf.buf != NULL) { 730 free(s->s3->rbuf.buf);
733 free(s->s3->rbuf.buf); 731 s->s3->rbuf.buf = NULL;
734 s->s3->rbuf.buf = NULL;
735 }
736 return 1; 732 return 1;
737} 733}
738 734