summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-01-13 11:20:47 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-01-13 11:20:47 (GMT)
commit17aaca4d226e48396437c512b6ea1873fc75b56c (patch)
tree2a22523717029923e79cb65801d4cbe163c58691 /Swiften/Network
parentf3bc816af1b0d61452de973963e453bf3b3f95a2 (diff)
parentbf6e16ca647c549fab4e6f6fc83ddc87d3ea9bc4 (diff)
downloadswift-17aaca4d226e48396437c512b6ea1873fc75b56c.zip
swift-17aaca4d226e48396437c512b6ea1873fc75b56c.tar.bz2
Merge branch 'swift-2.x'
* swift-2.x: Remove incorrect CFRelease() calls in MacOSXProxyProvider. Change-Id: Ia9fe8954839d65be9e337304ce095c7b48a64155
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/MacOSXProxyProvider.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/Swiften/Network/MacOSXProxyProvider.cpp b/Swiften/Network/MacOSXProxyProvider.cpp
index 918e18c..3456c73 100644
--- a/Swiften/Network/MacOSXProxyProvider.cpp
+++ b/Swiften/Network/MacOSXProxyProvider.cpp
@@ -36,7 +36,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);
CFRelease(zero);
if(result != kCFCompareEqualTo) {
@@ -47,7 +46,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));
@@ -62,7 +60,6 @@ static HostAddressPort getFromDictionary(CFDictionaryRef dict, CFStringRef enabl
host += *iter;
}
}
- CFRelease(stringValue);
}
}
catch(...) {