Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2755)

Unified Diff: chrome/browser/worker_host/message_port_dispatcher.cc

Issue 5173005: Fix crash in web workers when entangled port sender is null. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/worker_host/message_port_dispatcher.cc
===================================================================
--- chrome/browser/worker_host/message_port_dispatcher.cc (revision 66481)
+++ chrome/browser/worker_host/message_port_dispatcher.cc (working copy)
@@ -195,11 +195,13 @@
sent_ports[i]->route_id = new_routing_ids[i];
}
- // Now send the message to the entangled port.
- IPC::Message* ipc_msg = new WorkerProcessMsg_Message(
- entangled_port.route_id, message, sent_message_port_ids,
- new_routing_ids);
- entangled_port.sender->Send(ipc_msg);
+ if (entangled_port.sender) {
+ // Now send the message to the entangled port.
+ IPC::Message* ipc_msg = new WorkerProcessMsg_Message(
+ entangled_port.route_id, message, sent_message_port_ids,
+ new_routing_ids);
+ entangled_port.sender->Send(ipc_msg);
+ }
}
}
@@ -210,9 +212,11 @@
}
MessagePort& port = message_ports_[message_port_id];
- port.sender->Send(new WorkerProcessMsg_MessagesQueued(port.route_id));
- port.queue_messages = true;
- port.sender = NULL;
+ if (port.sender) {
+ port.sender->Send(new WorkerProcessMsg_MessagesQueued(port.route_id));
+ port.queue_messages = true;
+ port.sender = NULL;
+ }
}
void MessagePortDispatcher::OnSendQueuedMessages(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698