fix: avoid contextBridge crash when RenderFrame address is reused #21501
Conversation
This file contains 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
Co-Authored-By: Jeremy Apthorp <nornagon@nornagon.net>
MarshallOfSound
approved these changes
Dec 13, 2019
deepak1556
reviewed
Dec 13, 2019
| context_bridge::RenderFramePersistenceStore* GetOrCreateStore( | ||
| content::RenderFrame* render_frame) { | ||
| auto it = GetStoreMap().find(render_frame); | ||
| if (it == GetStoreMap().end()) { | ||
| auto it = context_bridge::GetStoreMap().find(render_frame->GetRoutingID()); |
There was a problem hiding this comment.
Will there be a possibility of cross process access to this function ? GetRoutingID is not unique across processes.
There was a problem hiding this comment.
@deepak1556 No, the bridge operates across two contexts in the same process
deepak1556
approved these changes
Dec 13, 2019
ckerr
reviewed
Dec 13, 2019
| @@ -58,11 +58,15 @@ class RenderFramePersistenceStore final : public content::RenderFrameObserver { | |||
| // proxy maps are weak globals, i.e. these are not retained beyond | |||
| // there normal JS lifetime. You must check IsEmpty() | |||
|
|
|||
| int32_t routing_id_; | |||
There was a problem hiding this comment.
(nit) This is set in the constructor and never changes, so might as well be const
|
Release Notes Persisted
|
This was referenced Dec 13, 2019
|
I have automatically backported this PR to "8-x-y", please check out #21513 |
|
I have automatically backported this PR to "7-1-x", please check out #21514 |
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.
Description of Change
Fix a crash that was happening because
a) the RenderFramePersistenceStore map was keyed on a pointer, which are not guaranteed to be unique in the process and
b) the RenderFramePersistanceStore was not removing itself from the map when it was released, causing a bad access exception.
h/t @nornagon for help debugging.
Checklist
npm testpassesRelease Notes
Notes: Fixed contextBridge crash when opening and closing many windows.