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: remove CHECK_EQ for swapped RFH #30820

Merged
merged 1 commit into from Sep 3, 2021

Conversation

samuelmaddock
Copy link
Member

@samuelmaddock samuelmaddock commented Sep 2, 2021

Description of Change

fixes #30807

Backport a fix from #29290 which has already made it into main and 15-x-y branches.

The check below will get thrown sometimes when the old_host is a nullptr which I hadn't expected initially. The code works fine with this check removed.

auto* web_frame =
WebFrameMain::FromFrameTreeNodeId(new_host->GetFrameTreeNodeId());
if (web_frame) {
CHECK_EQ(web_frame->render_frame_host(), old_host);

Checklist

Release Notes

Notes: Fixed crash that occasionally happens when closing or opening BrowserWindows.

|old_host| may be nullptr if the previous RFH was shutdown.
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Sep 2, 2021
@samuelmaddock samuelmaddock added the backport-check-skip Skip trop's backport validity checking label Sep 2, 2021
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Sep 2, 2021
@samuelmaddock samuelmaddock added 12-x-y 13-x-y 14-x-y new-pr 🌱 PR opened in the last 24 hours semver/patch backwards-compatible bug fixes labels Sep 2, 2021
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Sep 2, 2021
@MarshallOfSound MarshallOfSound merged commit 9799589 into electron:14-x-y Sep 3, 2021
@release-clerk
Copy link

release-clerk bot commented Sep 3, 2021

Release Notes Persisted

Fixed crash that occasionally happens when closing or opening BrowserWindows.

@trop
Copy link
Contributor

trop bot commented Sep 3, 2021

I was unable to backport this PR to "12-x-y" cleanly;
you will need to perform this backport manually.

@trop
Copy link
Contributor

trop bot commented Sep 3, 2021

I have automatically backported this PR to "13-x-y", please check out #30834

@codebytere
Copy link
Member

Removing label for 12-x-y since this depends on #30076 which is not in 12.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants