diff options
| author | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 19:20:08 +0000 |
|---|---|---|
| committer | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 19:20:08 +0000 |
| commit | 2bf2c3c8d64ba382286b6eadc7c5cd3444caf2f7 (patch) | |
| tree | c6ad24a54fc043d8a0975bd2d0c85d4b52b230cc /ceee/ie/common | |
| parent | 79cbc48dc1523c41523c63fcee54b093cd5cbab8 (diff) | |
| download | chromium_src-2bf2c3c8d64ba382286b6eadc7c5cd3444caf2f7.zip chromium_src-2bf2c3c8d64ba382286b6eadc7c5cd3444caf2f7.tar.gz chromium_src-2bf2c3c8d64ba382286b6eadc7c5cd3444caf2f7.tar.bz2 | |
Verify that we don't receive a NULL pointer for the session_id. This check will be removed as soon as getSessionId is implemented in ChromeFrame. Also, it is not needed for the other code path as ChromeFrame does make the check in it.
BUG=3161153
TEST=None
Review URL: http://codereview.chromium.org/4321007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee/ie/common')
| -rw-r--r-- | ceee/ie/common/chrome_frame_host.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ceee/ie/common/chrome_frame_host.cc b/ceee/ie/common/chrome_frame_host.cc index 39ffd6b..22d6184 100644 --- a/ceee/ie/common/chrome_frame_host.cc +++ b/ceee/ie/common/chrome_frame_host.cc @@ -171,8 +171,12 @@ HRESULT ChromeFrameHost::GetSessionId(int* session_id) { if (chrome_frame_internal_) { return chrome_frame_internal_->getSessionId(session_id); } else { - *session_id = kInvalidChromeSessionId; - return S_OK; + // This whole else should be removed when getSessionId gets committed to + // ChromeFrame. + if (session_id != NULL) { + *session_id = kInvalidChromeSessionId; + return S_OK; + } } } NOTREACHED(); |