summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2020-09-01 06:01:30 +0000
committertb <>2020-09-01 06:01:30 +0000
commit11e6ab97bf74f0bf1f58d0f9997ea5f7d6f94579 (patch)
tree761468f1b33a6768921a742b537e053d20c53cb8
parentd74e0e8fb964cf8f0841796c511fab537ce48110 (diff)
downloadopenbsd-11e6ab97bf74f0bf1f58d0f9997ea5f7d6f94579.tar.gz
openbsd-11e6ab97bf74f0bf1f58d0f9997ea5f7d6f94579.tar.bz2
openbsd-11e6ab97bf74f0bf1f58d0f9997ea5f7d6f94579.zip
Zap NULL check before SSL_SESSION_free()
-rw-r--r--src/lib/libssl/ssl_sess.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 601a851860..7c96719b60 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_sess.c,v 1.88 2020/09/01 05:58:35 tb Exp $ */ 1/* $OpenBSD: ssl_sess.c,v 1.89 2020/09/01 06:01:30 tb 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 *
@@ -572,8 +572,7 @@ ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block, int *alert)
572 572
573 s->session_ctx->internal->stats.sess_hit++; 573 s->session_ctx->internal->stats.sess_hit++;
574 574
575 if (s->session != NULL) 575 SSL_SESSION_free(s->session);
576 SSL_SESSION_free(s->session);
577 s->session = sess; 576 s->session = sess;
578 s->verify_result = s->session->verify_result; 577 s->verify_result = s->session->verify_result;
579 return 1; 578 return 1;