Merge lp:~abreu-alexandre/oxide/fix-crash-scroll-message-handler into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

Fix a crash caused by a race if a message is being sent as the corresponding webcontents is being destroyed.

Fix a crash caused by a race if a message is being sent as the corresponding webcontents is being destroyed.

[Chris Coulson (chrisccoulson)]

This looks ok, but it needs a test (and rebasing on to the git branch)

review: Needs Fixing

Unmerged revisions

1449. By Alexandre Abreu on 2016-04-19

draft fix

=== modified file 'shared/browser/oxide_script_message_contents_helper.cc'
--- shared/browser/oxide_script_message_contents_helper.cc	2015-10-07 09:44:33 +0000
+++ shared/browser/oxide_script_message_contents_helper.cc	2016-04-19 20:37:04 +0000
@@ -121,6 +121,12 @@
                                      &params.wrapped_payload));
     WebFrame* target = frame;
     WebView* view = frame->GetView();
+    if (!view) {
+      ReturnError(render_frame_host,
+                  ScriptMessageParams::ERROR_NO_HANDLER,
+                  params);
+      return;
+    }
 
     while (target) {
       DCHECK_EQ(target->GetView(), view);