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,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2016 Isode Limited. | 2 | * Copyright (c) 2010-2019 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -44,9 +44,9 @@ BoostNetworkFactories::BoostNetworkFactories(EventLoop* eventLoop, std::shared_p | |||
| 44 | idnConverter = PlatformIDNConverter::create(); | 44 | idnConverter = PlatformIDNConverter::create(); |
| 45 | #ifdef USE_UNBOUND | 45 | #ifdef USE_UNBOUND |
| 46 | // TODO: What to do about idnConverter. | 46 | // TODO: What to do about idnConverter. |
| 47 | domainNameResolver = new UnboundDomainNameResolver(idnConverter, ioServiceThread.getIOService(), eventLoop); | 47 | domainNameResolver = new UnboundDomainNameResolver(idnConverter.get(), ioServiceThread.getIOService(), eventLoop); |
| 48 | #else | 48 | #else |
| 49 | domainNameResolver = new PlatformDomainNameResolver(idnConverter, eventLoop); | 49 | domainNameResolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop); |
| 50 | #endif | 50 | #endif |
| 51 | cryptoProvider = PlatformCryptoProvider::create(); | 51 | cryptoProvider = PlatformCryptoProvider::create(); |
| 52 | } | 52 | } |
| @@ -54,7 +54,6 @@ BoostNetworkFactories::BoostNetworkFactories(EventLoop* eventLoop, std::shared_p | |||
| 54 | BoostNetworkFactories::~BoostNetworkFactories() { | 54 | BoostNetworkFactories::~BoostNetworkFactories() { |
| 55 | delete cryptoProvider; | 55 | delete cryptoProvider; |
| 56 | delete domainNameResolver; | 56 | delete domainNameResolver; |
| 57 | delete idnConverter; | ||
| 58 | delete proxyProvider; | 57 | delete proxyProvider; |
| 59 | delete tlsFactories; | 58 | delete tlsFactories; |
| 60 | delete xmlParserFactory; | 59 | delete xmlParserFactory; |