Skip to content

Fix a few leaks and an incomplete copy in CFURLComponents #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2017
Merged

Fix a few leaks and an incomplete copy in CFURLComponents #939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CoreFoundation/URL.subproj/CFURLComponents.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ CF_SWIFT_EXPORT void __CFURLComponentsDeallocate(CFURLComponentsRef instance) {
if (instance->_userComponent) CFRelease(instance->_userComponent);
if (instance->_passwordComponent) CFRelease(instance->_passwordComponent);
if (instance->_hostComponent) CFRelease(instance->_hostComponent);
if (instance->_portComponent) CFRelease(instance->_portComponent);
if (instance->_pathComponent) CFRelease(instance->_pathComponent);
if (instance->_queryComponent) CFRelease(instance->_queryComponent);
if (instance->_fragmentComponent) CFRelease(instance->_fragmentComponent);
Expand Down Expand Up @@ -197,10 +198,12 @@ CF_EXPORT CFURLComponentsRef _CFURLComponentsCreateCopy(CFAllocatorRef alloc, CF
__CFLock(&components->_lock);
memory->_lock = CFLockInit;
memory->_urlString = components->_urlString ? CFStringCreateCopy(alloc, components->_urlString) : NULL;
memory->_parseInfo = components->_parseInfo;

memory->_schemeComponentValid = components->_schemeComponentValid;
memory->_userComponentValid = components->_userComponentValid;
memory->_hostComponentValid = components->_hostComponentValid;
memory->_passwordComponentValid = components->_passwordComponentValid;
memory->_portComponentValid = components->_portComponentValid;
memory->_pathComponentValid = components->_pathComponentValid;
memory->_queryComponentValid = components->_queryComponentValid;
Expand Down Expand Up @@ -305,7 +308,9 @@ CF_EXPORT CFURLRef _CFURLComponentsCopyURL(CFURLComponentsRef components) {
CF_EXPORT CFURLRef _CFURLComponentsCopyURLRelativeToURL(CFURLComponentsRef components, CFURLRef relativeToURL) {
CFStringRef urlString = _CFURLComponentsCopyString(components);
if (urlString) {
return CFURLCreateWithString(kCFAllocatorSystemDefault, urlString, relativeToURL);
CFURLRef url = CFURLCreateWithString(kCFAllocatorSystemDefault, urlString, relativeToURL);
CFRelease(urlString);
return url;
} else {
return NULL;
}
Expand Down Expand Up @@ -1135,6 +1140,7 @@ CF_EXPORT CFArrayRef _CFURLComponentsCopyQueryItems(CFURLComponentsRef component
CFArrayAppendValue(intermediateResult, entry);
CFRelease(entry);
CFRelease(nameString);
CFRelease(valueString);
}
else {
// at end of query while parsing the name string
Expand Down