Swiftdiff options
| author | Tobias Markmann <tobias.markmann@isode.com> | 2019-10-18 06:19:53 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tobias.markmann@isode.com> | 2019-10-18 06:19:53 (GMT) |
| commit | 7de9a3489c3e2ddc4c0ab78f43649c5d6be20aca (patch) | |
| tree | e0cfb4493ae07c3aa2270d3b94a1eb66ff4956dc /Swiften/Network/BoostNetworkFactories.cpp | |
| parent | 2239cdae45b39e675877ae32c86c47bcadce3090 (diff) | |
| download | swift-7de9a3489c3e2ddc4c0ab78f43649c5d6be20aca.zip swift-7de9a3489c3e2ddc4c0ab78f43649c5d6be20aca.tar.bz2 | |
Return unique_ptr in PlatformIDNConverter::create()
There are cases where users of this method forget to
free the pointer. This is now avoided by returning a
unique_ptr.
Test-Information:
All existing unit and integration tests, i.e. `./scons
test=all` pass.
Change-Id: I10a88c3361823074d81db7af8cec1bd70c409995
Diffstat (limited to 'Swiften/Network/BoostNetworkFactories.cpp')
| -rw-r--r-- | Swiften/Network/BoostNetworkFactories.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Swiften/Network/BoostNetworkFactories.cpp b/Swiften/Network/BoostNetworkFactories.cpp index 9fef73c..13a7960 100644 --- a/Swiften/Network/BoostNetworkFactories.cpp +++ b/Swiften/Network/BoostNetworkFactories.cpp @@ -1,11 +1,11 @@ /* - * Copyright (c) 2010-2016 Isode Limited. + * Copyright (c) 2010-2019 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Network/BoostNetworkFactories.h> #include <Swiften/Crypto/CryptoProvider.h> #include <Swiften/Crypto/PlatformCryptoProvider.h> #include <Swiften/IDN/IDNConverter.h> @@ -38,29 +38,28 @@ BoostNetworkFactories::BoostNetworkFactories(EventLoop* eventLoop, std::shared_p natTraverser = new NullNATTraverser(eventLoop); #endif networkEnvironment = new PlatformNetworkEnvironment(); xmlParserFactory = new PlatformXMLParserFactory(); tlsFactories = new PlatformTLSFactories(); proxyProvider = new PlatformProxyProvider(); idnConverter = PlatformIDNConverter::create(); #ifdef USE_UNBOUND // TODO: What to do about idnConverter. - domainNameResolver = new UnboundDomainNameResolver(idnConverter, ioServiceThread.getIOService(), eventLoop); + domainNameResolver = new UnboundDomainNameResolver(idnConverter.get(), ioServiceThread.getIOService(), eventLoop); #else - domainNameResolver = new PlatformDomainNameResolver(idnConverter, eventLoop); + domainNameResolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop); #endif cryptoProvider = PlatformCryptoProvider::create(); } BoostNetworkFactories::~BoostNetworkFactories() { delete cryptoProvider; delete domainNameResolver; - delete idnConverter; delete proxyProvider; delete tlsFactories; delete xmlParserFactory; delete networkEnvironment; delete natTraverser; delete connectionServerFactory; delete connectionFactory; delete timerFactory; } |