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

Unified Diff: content/renderer/render_view.cc

Issue 8142009: Add a second line of defense for receiving a bad message in the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 months 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 | « content/browser/tab_contents/tab_contents.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view.cc
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 91d9c2d1b830ccf86ef71d2eb6598593e6043699..49e96026a13c191478273455fc9bc1e5f27cb676 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -581,7 +581,8 @@ bool RenderView::OnMessageReceived(const IPC::Message& message) {
return true;
bool handled = true;
- IPC_BEGIN_MESSAGE_MAP(RenderView, message)
+ bool msg_is_ok = true;
+ IPC_BEGIN_MESSAGE_MAP_EX(RenderView, message, msg_is_ok)
IPC_MESSAGE_HANDLER(ViewMsg_Navigate, OnNavigate)
IPC_MESSAGE_HANDLER(ViewMsg_Stop, OnStop)
IPC_MESSAGE_HANDLER(ViewMsg_ReloadFrame, OnReloadFrame)
@@ -688,6 +689,13 @@ bool RenderView::OnMessageReceived(const IPC::Message& message) {
// Have the super handle all other messages.
IPC_MESSAGE_UNHANDLED(handled = RenderWidget::OnMessageReceived(message))
IPC_END_MESSAGE_MAP()
+
+ if (!msg_is_ok) {
+ // The message had a handler, but its deserialization failed.
+ // Kill the renderer.
jschuh 2011/10/04 21:08:10 Nit: "Kill the renderer" seems too terse. I worry
Charlie Reis 2011/10/04 21:58:38 Done.
+ CHECK(false) << "Unable to deserialize message in RenderView.";
+ }
+
return handled;
}
« no previous file with comments | « content/browser/tab_contents/tab_contents.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698