mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: avoid contextBridge crash when RenderFrame address is reused (#21501)

Browse source 
* fix: avoid contextBridge crash when RenderFrame address is reused

Co-Authored-By: Jeremy Apthorp <nornagon@nornagon.net>

* make routing_id_ const
This commit is contained in:
loc 2019-12-13 10:13:04 -08:00 • committed by Samuel Attard
parent c535e00187
commit 19cd8f3a02
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
shell/renderer/api/atom_api_context_bridge.cc
View file

@ -47,20 +47,12 @@ content::RenderFrame* GetRenderFrame(const v8::Local<v8::Object>& value) {
return content::RenderFrame::FromWebFrame(frame); return content::RenderFrame::FromWebFrame(frame);
} }
std::map<content::RenderFrame*, context_bridge::RenderFramePersistenceStore*>&
GetStoreMap() {
static base::NoDestructor<std::map<
content::RenderFrame*, context_bridge::RenderFramePersistenceStore*>>
store_map;
return *store_map;
}
context_bridge::RenderFramePersistenceStore* GetOrCreateStore( context_bridge::RenderFramePersistenceStore* GetOrCreateStore(
content::RenderFrame* render_frame) { content::RenderFrame* render_frame) {
auto it = GetStoreMap().find(render_frame); auto it = context_bridge::GetStoreMap().find(render_frame->GetRoutingID());
if (it == GetStoreMap().end()) { if (it == context_bridge::GetStoreMap().end()) {
auto* store = new context_bridge::RenderFramePersistenceStore(render_frame); auto* store = new context_bridge::RenderFramePersistenceStore(render_frame);
GetStoreMap().emplace(render_frame, store); context_bridge::GetStoreMap().emplace(render_frame->GetRoutingID(), store);
return store; return store;
} }
return it->second; return it->second;

10
shell/renderer/api/context_bridge/render_frame_context_bridge_store.cc
View file

@ -66,6 +66,12 @@ class CachedProxyLifeMonitor final : public ObjectLifeMonitor {
} // namespace } // namespace
std::map<int32_t, RenderFramePersistenceStore*>& GetStoreMap() {
static base::NoDestructor<std::map<int32_t, RenderFramePersistenceStore*>>
store_map;
return *store_map;
}
WeakGlobalPairNode::WeakGlobalPairNode(WeakGlobalPair pair) { WeakGlobalPairNode::WeakGlobalPairNode(WeakGlobalPair pair) {
this->pair = std::move(pair); this->pair = std::move(pair);
} }
@ -78,11 +84,13 @@ WeakGlobalPairNode::~WeakGlobalPairNode() {
RenderFramePersistenceStore::RenderFramePersistenceStore( RenderFramePersistenceStore::RenderFramePersistenceStore(
content::RenderFrame* render_frame) content::RenderFrame* render_frame)
: content::RenderFrameObserver(render_frame) {} : content::RenderFrameObserver(render_frame),
routing_id_(render_frame->GetRoutingID()) {}
RenderFramePersistenceStore::~RenderFramePersistenceStore() = default; RenderFramePersistenceStore::~RenderFramePersistenceStore() = default;
void RenderFramePersistenceStore::OnDestruct() { void RenderFramePersistenceStore::OnDestruct() {
GetStoreMap().erase(routing_id_);
delete this; delete this;
} }

4
shell/renderer/api/context_bridge/render_frame_context_bridge_store.h
View file

@ -58,11 +58,15 @@ class RenderFramePersistenceStore final : public content::RenderFrameObserver {
// proxy maps are weak globals, i.e. these are not retained beyond // proxy maps are weak globals, i.e. these are not retained beyond
// there normal JS lifetime. You must check IsEmpty() // there normal JS lifetime. You must check IsEmpty()
const int32_t routing_id_;
// object_identity ==> [from_value, proxy_value] // object_identity ==> [from_value, proxy_value]
std::map<int, WeakGlobalPairNode*> proxy_map_; std::map<int, WeakGlobalPairNode*> proxy_map_;
base::WeakPtrFactory<RenderFramePersistenceStore> weak_factory_{this}; base::WeakPtrFactory<RenderFramePersistenceStore> weak_factory_{this};
}; };
std::map<int32_t, RenderFramePersistenceStore*>& GetStoreMap();
} // namespace context_bridge } // namespace context_bridge
} // namespace api } // namespace api