diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 00:05:22 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 00:05:22 +0000 |
| commit | 58640fa257d09432b723e9891a3581ddedbee99d (patch) | |
| tree | 2ad9c5b9d4085a3a1bafd727854307be9c3c65bd | |
| parent | eb37e0a4a6e723abde3ca6aa1f6fecc75955363c (diff) | |
| download | chromium_src-58640fa257d09432b723e9891a3581ddedbee99d.zip chromium_src-58640fa257d09432b723e9891a3581ddedbee99d.tar.gz chromium_src-58640fa257d09432b723e9891a3581ddedbee99d.tar.bz2 | |
Fix for a chrome frame crasher seen in the chrome frame mstone 10 beta channel.
The crash occurs while processing an accelerator reflected from chrome and based on
the crash dump occurs while dereferencing a NULL IOleInPlaceSite member.
Fix is to check for the same.
BUG=72957
TEST=none at this point.
Review URL: http://codereview.chromium.org/6524003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74883 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 598c5d4..cef2081 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -1030,7 +1030,8 @@ END_MSG_MAP() RECT dummy_pos_rect = {0}; RECT dummy_clip_rect = {0}; OLEINPLACEFRAMEINFO dummy_frame_info = {0}; - if (FAILED(m_spInPlaceSite->GetWindowContext(in_place_frame_.Receive(), + if (!m_spInPlaceSite || + FAILED(m_spInPlaceSite->GetWindowContext(in_place_frame_.Receive(), dummy_ui_window.Receive(), &dummy_pos_rect, &dummy_clip_rect, |