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

Replace recursive call with while loop to prevent stack overflow. #5884

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
11 changes: 4 additions & 7 deletions Signal/Attachments/AttachmentDownloadRetryRunner.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ public class AttachmentDownloadRetryRunner {
}

private func run() async {
do {
self.isRunning = true
defer { self.isRunning = false }

self.isRunning = true
defer { self.isRunning = false }
// Run while there is a next timestamp.
while true {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This loop never breaks?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can break. If there is no more timestamps to handle it returns on line 92.
Functionally it is the same as before.

let nextTimestamp = db.read { tx in
return try? self.attachmentDownloadStore.nextRetryTimestamp(tx: tx.asV2Read)
}
Expand All @@ -102,9 +102,6 @@ public class AttachmentDownloadRetryRunner {
// Kick the tires to start any downloads.
attachmentDownloadManager.beginDownloadingIfNecessary()
}

// Run again to wait for the next timestamp.
await self.run()
}
}

Expand Down