Verify that we don't receive a NULL pointer for the session_id. This check wi...

ceee/ie/common/chrome_frame_host.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // ChromeFrameHost implementation.
 #include "ceee/ie/common/chrome_frame_host.h"
 
 #include <algorithm>
 #include <vector>
 
@@ skipping 153 matching lines @@
     return E_UNEXPECTED;
   }
 }
 
 HRESULT ChromeFrameHost::GetSessionId(int* session_id) {
   if (chrome_frame_) {
     CComQIPtr<IChromeFrameInternal> chrome_frame_internal_(chrome_frame_);
     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();
   return E_UNEXPECTED;
 }
 
 void ChromeFrameHost::OnFinalMessage(HWND window) {
   GetUnknown()->Release();
 }
 
@@ skipping 180 matching lines @@
 
   // Forward to the sink.
   event_sink_->OnCfPrivateMessage(V_BSTR(&data), V_BSTR(&origin), target);
 }
 
 STDMETHODIMP_(void) ChromeFrameHost::SetChromeProfileName(
     const wchar_t* chrome_profile_name) {
   chrome_profile_name_ = chrome_profile_name;
   DLOG(INFO) << "Assigned profile name " << chrome_profile_name_;
 }