diff options
author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 23:30:54 +0000 |
---|---|---|
committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 23:30:54 +0000 |
commit | 6ebfda42437a3ac3d27949a948f9d643bbcc146f (patch) | |
tree | 187980aea798099eccf5c5cf14b97275bd4db3b1 /chrome_frame | |
parent | 59bbde10b721f5d8a22c800abfef4e180e752130 (diff) | |
download | chromium_src-6ebfda42437a3ac3d27949a948f9d643bbcc146f.zip chromium_src-6ebfda42437a3ac3d27949a948f9d643bbcc146f.tar.gz chromium_src-6ebfda42437a3ac3d27949a948f9d643bbcc146f.tar.bz2 |
Fix a crash in ChromeActiveDocument::IEExec() when m_spClientSite is null.
BUG=27414
TEST=None
Review URL: http://codereview.chromium.org/384094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31852 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 4e862f9..2842e01 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -626,7 +626,7 @@ HRESULT ChromeActiveDocument::IEExec(const GUID* cmd_group_guid, ScopedComPtr<IOleCommandTarget> frame_cmd_target; ScopedComPtr<IOleInPlaceSite> in_place_site(m_spInPlaceSite); - if (!in_place_site.get()) { + if (!in_place_site.get() && m_spClientSite != NULL) { in_place_site.QueryFrom(m_spClientSite); } |