Fix memory leak in ssl_cache
diff --git a/library/ssl_cache.c b/library/ssl_cache.c
index d94a7d9..4c7d3db 100644
--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@@ -195,14 +195,6 @@
}
cur = old;
- memset( &cur->session, 0, sizeof(ssl_session) );
-#if defined(POLARSSL_X509_CRT_PARSE_C)
- if( cur->peer_cert.p != NULL )
- {
- polarssl_free( cur->peer_cert.p );
- memset( &cur->peer_cert, 0, sizeof(x509_buf) );
- }
-#endif /* POLARSSL_X509_CRT_PARSE_C */
}
#else /* POLARSSL_HAVE_TIME */
/*
@@ -219,16 +211,7 @@
cur = cache->chain;
cache->chain = cur->next;
-
-#if defined(POLARSSL_X509_CRT_PARSE_C)
- if( cur->peer_cert.p != NULL )
- {
- polarssl_free( cur->peer_cert.p );
- memset( &cur->peer_cert, 0, sizeof(x509_buf) );
- }
-#endif /* POLARSSL_X509_CRT_PARSE_C */
-
- memset( cur, 0, sizeof(ssl_cache_entry) );
+ cur->next = NULL;
prv->next = cur;
}
#endif /* POLARSSL_HAVE_TIME */
@@ -261,6 +244,15 @@
#if defined(POLARSSL_X509_CRT_PARSE_C)
/*
+ * If we're reusing an entry, free its certificate first
+ */
+ if( cur->peer_cert.p != NULL )
+ {
+ polarssl_free( cur->peer_cert.p );
+ memset( &cur->peer_cert, 0, sizeof(x509_buf) );
+ }
+
+ /*
* Store peer certificate
*/
if( session->peer_cert != NULL )