diff options
| author | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 07:09:09 +0000 |
|---|---|---|
| committer | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 07:09:09 +0000 |
| commit | 014c0330c5da4e22329973a741ddae1d1cfdb8bc (patch) | |
| tree | e356d05283bc00f4901c97a04667d07494b703a1 /chrome_frame | |
| parent | 34fda3e29292d492c9853b7f352569f2a3a39b2e (diff) | |
| download | chromium_src-014c0330c5da4e22329973a741ddae1d1cfdb8bc.zip chromium_src-014c0330c5da4e22329973a741ddae1d1cfdb8bc.tar.gz chromium_src-014c0330c5da4e22329973a741ddae1d1cfdb8bc.tar.bz2 | |
Fix top crashers in the latest build.
Fixes crashes due to NavigationManager instance being NULL.
TBR=tommi
BUG=38602,38603
Review URL: http://codereview.chromium.org/1100006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/bho.cc | 3 | ||||
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc index aa333b7..e679a20 100644 --- a/chrome_frame/bho.cc +++ b/chrome_frame/bho.cc @@ -254,7 +254,8 @@ HRESULT Bho::OnHttpEquiv(IBrowserService_OnHttpEquiv_Fn original_httpequiv, } else if (done) { DLOG(INFO) << "Releasing cached data."; NavigationManager* mgr = NavigationManager::GetThreadInstance(); - mgr->ReleaseRequestData(); + if (mgr) + mgr->ReleaseRequestData(); } return original_httpequiv(browser, shell_view, done, in_arg, out_arg); diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index a0bcae4..3c10d15 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -232,11 +232,12 @@ STDMETHODIMP ChromeActiveDocument::Load(BOOL fully_avalable, moniker_name, bind_context, mgr ? mgr->original_url_with_fragment() : std::wstring())); + scoped_refptr<RequestData> data; if (mgr) { mgr->set_original_url_with_fragment(L""); + data = mgr->GetActiveRequestData(url.c_str()); } - scoped_refptr<RequestData> data(mgr->GetActiveRequestData(url.c_str())); DLOG_IF(INFO, data) << "Got active request data"; DLOG_IF(WARNING, data.get() == NULL) << "NO active request data"; |