summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 17:53:23 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-18 17:53:23 +0000
commitb9d3eef5fb99e569cb2c30b99d0b74e226a1c635 (patch)
tree6cd6c72fe25c463d3deee7c400b00bbb895a9a84
parent74379a8991c46090c03ffe5accca7ee09f7d64dd (diff)
downloadchromium_src-b9d3eef5fb99e569cb2c30b99d0b74e226a1c635.zip
chromium_src-b9d3eef5fb99e569cb2c30b99d0b74e226a1c635.tar.gz
chromium_src-b9d3eef5fb99e569cb2c30b99d0b74e226a1c635.tar.bz2
NULL check the return value during navigation to prevent a crash.
BUG=1384003 Review URL: http://codereview.chromium.org/2966 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2366 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/web_contents.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc
index a796dc6..72f8d82 100644
--- a/chrome/browser/web_contents.cc
+++ b/chrome/browser/web_contents.cc
@@ -606,6 +606,8 @@ void WebContents::SavePage(const std::wstring& main_file,
bool WebContents::NavigateToPendingEntry(bool reload) {
NavigationEntry* entry = controller()->GetPendingEntry();
RenderViewHost* dest_render_view_host = render_manager_.Navigate(*entry);
+ if (!dest_render_view_host)
+ return false; // Unable to create the desired render view host.
// Used for page load time metrics.
current_load_start_ = TimeTicks::Now();