diff options
| author | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 21:41:54 +0000 |
|---|---|---|
| committer | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 21:41:54 +0000 |
| commit | 6017343b0310c2f2314baabcccf3c702d71309c4 (patch) | |
| tree | e968247a5817f9e46fa165bbbd33bac4f19d4bd8 /chrome_frame/protocol_sink_wrap.cc | |
| parent | 77f76019c424c2421a5e29f4e3d7a26b1e296de5 (diff) | |
| download | chromium_src-6017343b0310c2f2314baabcccf3c702d71309c4.zip chromium_src-6017343b0310c2f2314baabcccf3c702d71309c4.tar.gz chromium_src-6017343b0310c2f2314baabcccf3c702d71309c4.tar.bz2 | |
Add an exceptionbarrier in Hook_Start(Ex). This is an attempt to reduce the amount of false positive crash reports - when exception is swallowed and is almost always not a problem due ChromeFrame code.
BUG=51830
Review URL: http://codereview.chromium.org/3171011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/protocol_sink_wrap.cc')
| -rw-r--r-- | chrome_frame/protocol_sink_wrap.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome_frame/protocol_sink_wrap.cc b/chrome_frame/protocol_sink_wrap.cc index 0b3e5a7..c435a02 100644 --- a/chrome_frame/protocol_sink_wrap.cc +++ b/chrome_frame/protocol_sink_wrap.cc @@ -175,6 +175,7 @@ STDMETHODIMP ProtocolSinkWrap::ReportResult(HRESULT result, DWORD error, LPCWSTR result_text) { DLOG(INFO) << "ProtocolSinkWrap::ReportResult: result: " << result << " error: " << error << " Text: " << (result_text ? result_text : L""); + ExceptionBarrier barrier; HRESULT hr = prot_data_->ReportResult(delegate_, result, error, result_text); return hr; } @@ -613,6 +614,7 @@ STDMETHODIMP Hook_Start(InternetProtocol_Start_Fn orig_start, return E_INVALIDARG; DLOG_IF(INFO, url != NULL) << "OnStart: " << url << PiFlags2Str(flags); + ExceptionBarrier barrier; ScopedComPtr<IBindCtx> bind_ctx = BindCtxFromIBindInfo(bind_info); if (!bind_ctx) { // MSHTML sometimes takes a short path, skips the creation of @@ -665,6 +667,7 @@ STDMETHODIMP Hook_StartEx(InternetProtocol_StartEx_Fn orig_start_ex, if (!uri || !prot_sink || !bind_info) return E_INVALIDARG; + ExceptionBarrier barrier; ScopedBstr url; uri->GetPropertyBSTR(Uri_PROPERTY_ABSOLUTE_URI, url.Receive(), 0); DLOG_IF(INFO, url != NULL) << "OnStartEx: " << url << PiFlags2Str(flags); |