diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 21:30:30 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 21:30:30 +0000 |
| commit | 58174a72e2dc05e3240b38bc4be8edd28d129856 (patch) | |
| tree | 8190a7737dc5148e1c3083e3557ce9027457a084 /chrome_frame | |
| parent | 0794db6b6f44a76f45bc5b81ca5503249074af8f (diff) | |
| download | chromium_src-58174a72e2dc05e3240b38bc4be8edd28d129856.zip chromium_src-58174a72e2dc05e3240b38bc4be8edd28d129856.tar.gz chromium_src-58174a72e2dc05e3240b38bc4be8edd28d129856.tar.bz2 | |
Fix a chrome frame crash reported on the crash server. This occurs while attempting to reuse an existing automation client from a cached
document. It appears that there are cases where the automation client in the cached document can be NULL.
Will work on a better way to cache automation client on trunk.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=43255
Bug=43255
Review URL: http://codereview.chromium.org/1964002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index a7796d5..4a42951 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -72,7 +72,7 @@ HRESULT ChromeActiveDocument::FinalConstruct() { // ownership of the cached document's automation client. This is an // optimization to get Chrome active documents to load faster. ChromeActiveDocument* cached_document = g_active_doc_cache.Get(); - if (cached_document) { + if (cached_document && cached_document->IsValid()) { DCHECK(automation_client_.get() == NULL); automation_client_.swap(cached_document->automation_client_); DLOG(INFO) << "Reusing automation client instance from " |