Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-01-02 19:48:35 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-01-02 19:50:19 (GMT) |
| commit | bf6e16ca647c549fab4e6f6fc83ddc87d3ea9bc4 (patch) | |
| tree | 29ad338bd5c9d589470d7aec40b7e7262e299b1c | |
| parent | f572ff58428c8ce6b5babb60f0ea6999d0be29d7 (diff) | |
| download | swift-bf6e16ca647c549fab4e6f6fc83ddc87d3ea9bc4.zip swift-bf6e16ca647c549fab4e6f6fc83ddc87d3ea9bc4.tar.bz2 | |
Remove incorrect CFRelease() calls in MacOSXProxyProvider.
This avoids a potential crash when using proxies on Mac OS X.
Change-Id: I393ba03a6ffd89668e31c5dad8c0d7277601fc14
| -rw-r--r-- | Swift/ChangeLog.md | 4 | ||||
| -rw-r--r-- | Swiften/Network/MacOSXProxyProvider.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Swift/ChangeLog.md b/Swift/ChangeLog.md index bef90f5..544dcfa 100644 --- a/Swift/ChangeLog.md +++ b/Swift/ChangeLog.md @@ -1,3 +1,7 @@ +2.1 +--- +- Fixed potential crash when using proxies on Mac OS X. + 2.0-beta2 --------- - Enable auto-completion of nicknames that don't start with a letter. diff --git a/Swiften/Network/MacOSXProxyProvider.cpp b/Swiften/Network/MacOSXProxyProvider.cpp index eaadd28..00fb478 100644 --- a/Swiften/Network/MacOSXProxyProvider.cpp +++ b/Swiften/Network/MacOSXProxyProvider.cpp @@ -27,7 +27,6 @@ static HostAddressPort getFromDictionary(CFDictionaryRef dict, CFStringRef enabl const int i = 0; CFNumberRef zero = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &i); CFComparisonResult result = CFNumberCompare(numberValue, zero, NULL); - CFRelease(numberValue); if(result != kCFCompareEqualTo) { int port = 0; @@ -37,7 +36,6 @@ static HostAddressPort getFromDictionary(CFDictionaryRef dict, CFStringRef enabl CFNumberRef numberValue = reinterpret_cast<CFNumberRef> (CFDictionaryGetValue(dict, portKey)); if(numberValue != NULL) { CFNumberGetValue(numberValue, kCFNumberIntType, &port); - CFRelease(numberValue); } CFStringRef stringValue = reinterpret_cast<CFStringRef> (CFDictionaryGetValue(dict, hostKey)); @@ -52,7 +50,6 @@ static HostAddressPort getFromDictionary(CFDictionaryRef dict, CFStringRef enabl host += *iter; } } - CFRelease(stringValue); } } catch(...) { |