summaryrefslogtreecommitdiffstats
path: root/chrome_frame/bho.cc
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-28 03:35:51 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-28 03:35:51 +0000
commit8d260c736c103eec3523303a7fa4f3b9145a0b8c (patch)
tree4a629bec01bc4e981656d00fbd6897b5424fceb7 /chrome_frame/bho.cc
parenta7ff313cda28cd6264f413bb7c50ad4016137a43 (diff)
downloadchromium_src-8d260c736c103eec3523303a7fa4f3b9145a0b8c.zip
chromium_src-8d260c736c103eec3523303a7fa4f3b9145a0b8c.tar.gz
chromium_src-8d260c736c103eec3523303a7fa4f3b9145a0b8c.tar.bz2
Do not attempt to parse NULL headers.
TBR=amit TEST=fixes one of the top crashes in the lastest release. BUG=36985 Review URL: http://codereview.chromium.org/661256 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40234 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/bho.cc')
-rw-r--r--chrome_frame/bho.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc
index a142727..9f64753 100644
--- a/chrome_frame/bho.cc
+++ b/chrome_frame/bho.cc
@@ -280,6 +280,8 @@ void Bho::OnBeginningTransaction(IWebBrowser2* browser, const wchar_t* url,
referrer_.clear();
const wchar_t* both_headers[] = { headers, additional_headers };
for (int i = 0; referrer_.empty() && i < arraysize(both_headers); ++i) {
+ if (!both_headers[i])
+ continue;
std::string raw_headers_utf8 = WideToUTF8(both_headers[i]);
std::string http_headers =
net::HttpUtil::AssembleRawHeaders(raw_headers_utf8.c_str(),