| Index: extensions/renderer/messaging_bindings.cc
|
| diff --git a/extensions/renderer/messaging_bindings.cc b/extensions/renderer/messaging_bindings.cc
|
| index 0d87c4cd35f37f7571c5f030952b391eb505370d..95bf59a4b6735d44be9cdeef4ac7ed0c1910e65f 100644
|
| --- a/extensions/renderer/messaging_bindings.cc
|
| +++ b/extensions/renderer/messaging_bindings.cc
|
| @@ -448,15 +448,16 @@ void MessagingBindings::DispatchOnConnect(
|
| const ExtensionMsg_ExternalConnectionInfo& info,
|
| const std::string& tls_channel_id,
|
| content::RenderFrame* restrict_to_render_frame) {
|
| + int routing_id = restrict_to_render_frame
|
| + ? restrict_to_render_frame->GetRoutingID()
|
| + : MSG_ROUTING_NONE;
|
| bool port_created = false;
|
| context_set.ForEach(
|
| info.target_id, restrict_to_render_frame,
|
| base::Bind(&DispatchOnConnectToScriptContext, target_port_id,
|
| channel_name, &source, info, tls_channel_id, &port_created));
|
| + // Note: |restrict_to_render_frame| may have been deleted at this point!
|
|
|
| - int routing_id = restrict_to_render_frame
|
| - ? restrict_to_render_frame->GetRoutingID()
|
| - : MSG_ROUTING_NONE;
|
| if (port_created) {
|
| content::RenderThread::Get()->Send(
|
| new ExtensionHostMsg_OpenMessagePort(routing_id, target_port_id));
|
|
|