Skip to content
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.

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

Fix a leak related to self not being weak #806

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions Sources/Nuke/Tasks/TaskFetchOriginalData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ final class TaskFetchOriginalData: AsyncPipelineTask<(Data, URLResponse?)> {
guard let self else {
return finish()
}
self.pipeline.queue.async {
self.pipeline.queue.async { [weak self] in
prabhuamol marked this conversation as resolved.
Show resolved Hide resolved
guard let self else { return }
self.loadData(urlRequest: urlRequest, finish: finish)
}
}
Expand Down Expand Up @@ -83,14 +84,16 @@ final class TaskFetchOriginalData: AsyncPipelineTask<(Data, URLResponse?)> {
let dataLoader = pipeline.delegate.dataLoader(for: request, pipeline: pipeline)
let dataTask = dataLoader.loadData(with: urlRequest, didReceiveData: { [weak self] data, response in
guard let self else { return }
self.pipeline.queue.async {
self.pipeline.queue.async { [weak self] in
guard let self else { return }
self.dataTask(didReceiveData: data, response: response)
}
}, completion: { [weak self] error in
finish() // Finish the operation!
guard let self else { return }
signpost(self, "LoadImageData", .end, "Finished with size \(Formatter.bytes(self.data.count))")
self.pipeline.queue.async {
self.pipeline.queue.async { [weak self] in
guard let self else { return }
self.dataTaskDidFinish(error: error)
}
})
Expand Down
9 changes: 6 additions & 3 deletions Sources/Nuke/Tasks/TaskFetchWithPublisher.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ final class TaskFetchWithPublisher: AsyncPipelineTask<(Data, URLResponse?)> {
guard let self else {
return finish()
}
self.pipeline.queue.async {
self.pipeline.queue.async { [weak self] in
guard let self else { return }
self.loadData { finish() }
}
}
Expand All @@ -40,12 +41,14 @@ final class TaskFetchWithPublisher: AsyncPipelineTask<(Data, URLResponse?)> {
let cancellable = publisher.sink(receiveCompletion: { [weak self] result in
finish() // Finish the operation!
guard let self else { return }
self.pipeline.queue.async {
self.pipeline.queue.async { [weak self] in
guard let self else { return }
self.dataTaskDidFinish(result)
}
}, receiveValue: { [weak self] data in
guard let self else { return }
self.pipeline.queue.async {
self.pipeline.queue.async { [weak self] in
guard let self else { return }
self.data.append(data)
}
})
Expand Down
7 changes: 5 additions & 2 deletions Sources/Nuke/Tasks/TaskLoadImage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ final class TaskLoadImage: AsyncPipelineTask<ImageResponse> {
ImagePipeline.Error.processingFailed(processor: processor, context: context, error: error)
}
}
self.pipeline.queue.async {
self.pipeline.queue.async { [weak self] in
guard let self else { return }
self.operation = nil
self.didFinishProcessing(result: result, isCompleted: isCompleted)
}
Expand Down Expand Up @@ -117,7 +118,9 @@ final class TaskLoadImage: AsyncPipelineTask<ImageResponse> {
let response = signpost(isCompleted ? "DecompressImage" : "DecompressProgressiveImage") {
self.pipeline.delegate.decompress(response: response, request: self.request, pipeline: self.pipeline)
}
self.pipeline.queue.async {

self.pipeline.queue.async { [weak self] in
guard let self else { return }
self.operation = nil
self.didReceiveDecompressedImage(response, isCompleted: isCompleted)
}
Expand Down
Loading