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

[iOS] - Fix alert continuation leak when WebKit automatically cancels the request #27069

Merged
merged 1 commit into from
Dec 20, 2024

Conversation

Brandon-T
Copy link
Contributor

Summary

  • Fix alert continuation leak when WebKit automatically cancels the request.
  • Handle manual cancellation as well, when a new request starts while the popup is already showing.

Resolves brave/brave-browser#42986

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@Brandon-T Brandon-T added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-teamcity Do not run builds in TeamCity labels Dec 19, 2024
@Brandon-T Brandon-T self-assigned this Dec 19, 2024
@Brandon-T Brandon-T requested a review from a team as a code owner December 19, 2024 16:34
@Brandon-T Brandon-T force-pushed the bugfix/AlertContinuationLeak branch from e1c7ae8 to 33b9276 Compare December 19, 2024 16:36
}
} onCancel: { [weak tab] in
Copy link
Contributor

Choose a reason for hiding this comment

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

do you still have to nil externalAppPopupContinuation if you weak reference tab?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. The continuation needs to have its reference set to nil or it won't be freed until the tab dies.

@@ -429,6 +430,8 @@ class Tab: NSObject {

/// Boolean tracking custom url-scheme alert presented
var isExternalAppAlertPresented = false
var externalAppPopup: AlertPopupView?
Copy link
Contributor

Choose a reason for hiding this comment

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

and why we store a externalAppPopup? it's not being used anywhere

Copy link
Contributor Author

@Brandon-T Brandon-T Dec 19, 2024

Choose a reason for hiding this comment

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

@Brandon-T Brandon-T merged commit 144e1e4 into master Dec 20, 2024
18 checks passed
@Brandon-T Brandon-T deleted the bugfix/AlertContinuationLeak branch December 20, 2024 16:02
@github-actions github-actions bot added this to the 1.75.x - Nightly milestone Dec 20, 2024
@brave-builds
Copy link
Collaborator

Released in v1.75.116

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-teamcity Do not run builds in TeamCity CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[iOS] - Fix continuation leak in AlertPopupView
4 participants