diff options
| author | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-28 06:16:00 +0000 |
|---|---|---|
| committer | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-28 06:16:00 +0000 |
| commit | 77059f7db11d31fb7a144b3f4e4d4a93c1d6fd67 (patch) | |
| tree | 8938c049619eb826353d5e3f4a420350c2a85f93 /chrome_frame | |
| parent | 8d260c736c103eec3523303a7fa4f3b9145a0b8c (diff) | |
| download | chromium_src-77059f7db11d31fb7a144b3f4e4d4a93c1d6fd67.zip chromium_src-77059f7db11d31fb7a144b3f4e4d4a93c1d6fd67.tar.gz chromium_src-77059f7db11d31fb7a144b3f4e4d4a93c1d6fd67.tar.bz2 | |
Fix a crash in ChromeActiveDocument::IOleObject_SetClientSite.
Check validity of existing document soite before QI for
doc host handler.
BUG=37008
TEST=none
TBR=ananta
Review URL: http://codereview.chromium.org/660255
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 886c9df..d92fea7 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -386,7 +386,9 @@ HRESULT ChromeActiveDocument::IOleObject_SetClientSite( } ScopedComPtr<IDocHostUIHandler> doc_host_handler; - doc_host_handler.QueryFrom(doc_site_); + if (doc_site_) { + doc_host_handler.QueryFrom(doc_site_); + } if (doc_host_handler.get()) { doc_host_handler->HideUI(); |