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.

Sign up for GitHub

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

Jump to bottom

fix: avoid contextBridge double free on garbage collection #21736

Merged
merged 2 commits into from Jan 11, 2020
Merged

fix: avoid contextBridge double free on garbage collection #21736

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f016f61
fix: reset next/prev pointers for life-monitored nodes
loc Dec 20, 2019
e0d7c69
fix: don't double-delete nodes in a linked list
loc Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions shell/renderer/api/context_bridge/render_frame_context_bridge_store.cc
View file
Open in desktop
Expand Up @@ -47,9 +47,11 @@ class CachedProxyLifeMonitor final : public ObjectLifeMonitor {
}
if (node_->prev) {
node_->prev->next = node_->next;
node_->prev = nullptr;
}
if (node_->next) {
node_->next->prev = node_->prev;
node_->next = nullptr;
}
if (!node_->prev && !node_->next) {
// Must be a single length linked list
Expand All @@ -76,11 +78,7 @@ WeakGlobalPairNode::WeakGlobalPairNode(WeakGlobalPair pair) {
this->pair = std::move(pair);
}

WeakGlobalPairNode::~WeakGlobalPairNode() {
if (next) {
delete next;
}
}
WeakGlobalPairNode::~WeakGlobalPairNode() {}

RenderFramePersistenceStore::RenderFramePersistenceStore(
content::RenderFrame* render_frame)
Expand Down