1 files changed, 2 insertions, 3 deletions
diff --git a/Swiften/Network/TLSConnection.cpp b/Swiften/Network/TLSConnection.cpp
index 7c293d1..82bf114 100644
--- a/Swiften/Network/TLSConnection.cpp
+++ b/Swiften/Network/TLSConnection.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/TLSConnection.h>
 
 #include <boost/bind.hpp>
 
 #include <Swiften/Network/HostAddressPort.h>
@@ -26,19 +26,18 @@ TLSConnection::TLSConnection(Connection::ref connection, TLSContextFactory* tlsF
     connection->onDataWritten.connect(boost::bind(&TLSConnection::handleRawDataWritten, this));
     connection->onDisconnected.connect(boost::bind(&TLSConnection::handleRawDisconnected, this, _1));
 }
 
 TLSConnection::~TLSConnection() {
     connection->onConnectFinished.disconnect(boost::bind(&TLSConnection::handleRawConnectFinished, this, _1));
     connection->onDataRead.disconnect(boost::bind(&TLSConnection::handleRawDataRead, this, _1));
     connection->onDataWritten.disconnect(boost::bind(&TLSConnection::handleRawDataWritten, this));
     connection->onDisconnected.disconnect(boost::bind(&TLSConnection::handleRawDisconnected, this, _1));
-    delete context;
 }
 
 void TLSConnection::handleTLSConnectFinished(bool error) {
     onConnectFinished(error);
     if (error) {
         disconnect();
     }
 }
 
@@ -65,19 +64,19 @@ void TLSConnection::write(const SafeByteArray& data) {
 HostAddressPort TLSConnection::getLocalAddress() const {
     return connection->getLocalAddress();
 }
 
 HostAddressPort TLSConnection::getRemoteAddress() const {
     return connection->getRemoteAddress();
 }
 
 TLSContext* TLSConnection::getTLSContext() const {
-    return context;
+    return context.get();
 }
 
 void TLSConnection::handleRawConnectFinished(bool error) {
     connection->onConnectFinished.disconnect(boost::bind(&TLSConnection::handleRawConnectFinished, this, _1));
     if (error) {
         onConnectFinished(true);
     }
     else {
         context->connect();