diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 22:25:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 22:25:18 +0000 |
| commit | 5538da2e9ebd52b32a64355fa555264825c404a7 (patch) | |
| tree | b750e6dff525ae7f28799d3a614bef29e0a692ac /chrome/renderer | |
| parent | 7e6779d40e08927676047e25e4e6405164ef5779 (diff) | |
| download | chromium_src-5538da2e9ebd52b32a64355fa555264825c404a7.zip chromium_src-5538da2e9ebd52b32a64355fa555264825c404a7.tar.gz chromium_src-5538da2e9ebd52b32a64355fa555264825c404a7.tar.bz2 | |
Avoid a CHECK when the modal_loop_pump_messages_event handle comes in as NULL to the renderer. This happens with some "virus scanners".
BUG=25583
Review URL: http://codereview.chromium.org/348046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index f934067..fe3bec1 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -820,6 +820,11 @@ void WebPluginDelegateProxy::OnSetWindowlessPumpEvent( HANDLE modal_loop_pump_messages_event) { DCHECK(modal_loop_pump_messages_event_ == NULL); + // Bug 25583: this can be null because some "virus scanners" block the + // DuplicateHandle call in the plugin process. + if (!modal_loop_pump_messages_event) + return; + modal_loop_pump_messages_event_.reset( new base::WaitableEvent(modal_loop_pump_messages_event)); } |