[SR-3481] Fix for memory leak in NSURLComponents #897
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nethraravindran
commented
Feb 27, 2017
| private let _components : CFURLComponentsRef! | ||
|
|
||
| deinit { | ||
| if let component = _components { | ||
| __CFURLComponentsDeallocate(component) |
There was a problem hiding this comment.
Called CoreFoundation deallocate method to free the resources.
nethraravindran
commented
Feb 27, 2017
| static void __CFURLComponentsDeallocate(CFTypeRef cf) { | ||
| CFURLComponentsRef instance = (CFURLComponentsRef)cf; | ||
| __CFGenericValidateType(cf, _CFURLComponentsGetTypeID()); | ||
| CF_EXPORT void __CFURLComponentsDeallocate(CFURLComponentsRef instance) { |
There was a problem hiding this comment.
Used CF_EXPORT in-order to call from deinit
There was a problem hiding this comment.
Pleaes make this CF_SWIFT_EXPORT
nethraravindran
changed the title
nethraravindran
changed the title
Foundation/NSURL.swift
Outdated
| @@ -948,8 +948,15 @@ open class NSURLQueryItem : NSObject, NSSecureCoding, NSCopying { | |||
| } | |||
|
|
|||
| open class NSURLComponents: NSObject, NSCopying { | |||
| private let _cfinfo = _CFInfo(typeID: _CFURLComponentsGetTypeID()) | |||
There was a problem hiding this comment.
What's the purpose of this line?
There was a problem hiding this comment.
Realised it is no longer required. Will remove.
parkera
reviewed
Feb 27, 2017
| static void __CFURLComponentsDeallocate(CFTypeRef cf) { | ||
| CFURLComponentsRef instance = (CFURLComponentsRef)cf; | ||
| __CFGenericValidateType(cf, _CFURLComponentsGetTypeID()); | ||
| CF_EXPORT void __CFURLComponentsDeallocate(CFURLComponentsRef instance) { |
There was a problem hiding this comment.
Pleaes make this CF_SWIFT_EXPORT
| @@ -30,6 +30,8 @@ typedef struct __CFURLComponents *CFURLComponentsRef; | |||
|
|
|||
| CF_EXPORT CFTypeID _CFURLComponentsGetTypeID(void); | |||
|
|
|||
| CF_EXPORT void __CFURLComponentsDeallocate(CFURLComponentsRef); | |||
|
@parkera Addressed the changes. |
|
@swift-ci please test and merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.