diff options
| author | dtapuska <dtapuska@chromium.org> | 2015-01-06 07:34:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-06 15:35:58 +0000 |
| commit | ea800be6cdc58af3b34d6b98f4a26ed35bedb671 (patch) | |
| tree | 43c4f9f740b3ef8fe544c5c41574ca8030732e49 /mojo | |
| parent | 78b59cef5461bf1b9412e41c711af9e11c856087 (diff) | |
| download | chromium_src-ea800be6cdc58af3b34d6b98f4a26ed35bedb671.zip chromium_src-ea800be6cdc58af3b34d6b98f4a26ed35bedb671.tar.gz chromium_src-ea800be6cdc58af3b34d6b98f4a26ed35bedb671.tar.bz2 | |
Mojo HTML viewer crash
Check that we have a valid navigator_host_ object before we call methods on it
BUG=443193
Review URL: https://codereview.chromium.org/790793007
Cr-Commit-Position: refs/heads/master@{#310090}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/services/html_viewer/html_document.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mojo/services/html_viewer/html_document.cc b/mojo/services/html_viewer/html_document.cc index 1892ce85..7688442 100644 --- a/mojo/services/html_viewer/html_document.cc +++ b/mojo/services/html_viewer/html_document.cc @@ -243,9 +243,11 @@ blink::WebNavigationPolicy HTMLDocument::decidePolicyForNavigation( if (CanNavigateLocally(frame, request)) return default_policy; - navigator_host_->RequestNavigate( - WebNavigationPolicyToNavigationTarget(default_policy), - mojo::URLRequest::From(request).Pass()); + if (navigator_host_.get()) { + navigator_host_->RequestNavigate( + WebNavigationPolicyToNavigationTarget(default_policy), + mojo::URLRequest::From(request).Pass()); + } return blink::WebNavigationPolicyIgnore; } @@ -261,7 +263,8 @@ void HTMLDocument::didNavigateWithinPage( blink::WebLocalFrame* frame, const blink::WebHistoryItem& history_item, blink::WebHistoryCommitType commit_type) { - navigator_host_->DidNavigateLocally(history_item.urlString().utf8()); + if (navigator_host_.get()) + navigator_host_->DidNavigateLocally(history_item.urlString().utf8()); } blink::WebEncryptedMediaClient* HTMLDocument::encryptedMediaClient() { |