From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 3 Mar 2017 14:20:20 +0000 (-0500)
Subject: Don't double free VPs.  Fixes #1927
X-Git-Tag: release_3_0_13~6
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=8e4c9b3aa2034f6083a7b17a748491ee1a26d32a

Don't double free VPs.  Fixes #1927
---

diff --git a/src/main/tls.c b/src/main/tls.c
index 3a579f9..93ba27f 100644
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -2444,18 +2444,6 @@ static int set_ecdh_curve(SSL_CTX *ctx, char const *ecdh_curve, bool disable_sin
  * is called when refcount > 0 sometimes, if another thread
  * is using the session
  */
-static void sess_free_vps(UNUSED void *parent, void *data_ptr,
-				UNUSED CRYPTO_EX_DATA *ad, UNUSED int idx,
-				UNUSED long argl, UNUSED void *argp)
-{
-	VALUE_PAIR *vp = data_ptr;
-	if (!vp) return;
-
-	DEBUG2(LOG_PREFIX ": Freeing cached session VPs");
-
-	fr_pair_list_free(&vp);
-}
-
 static void sess_free_certs(UNUSED void *parent, void *data_ptr,
 				UNUSED CRYPTO_EX_DATA *ad, UNUSED int idx,
 				UNUSED long argl, UNUSED void *argp)
@@ -2900,7 +2888,7 @@ post_ca:
 
 		SSL_CTX_set_quiet_shutdown(ctx, 1);
 		if (fr_tls_ex_index_vps < 0)
-			fr_tls_ex_index_vps = SSL_SESSION_get_ex_new_index(0, NULL, NULL, NULL, sess_free_vps);
+			fr_tls_ex_index_vps = SSL_SESSION_get_ex_new_index(0, NULL, NULL, NULL, NULL);
 	}
 
 	/*