diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 01:58:42 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 01:58:42 +0000 |
| commit | c247cab7f2cf58a73b646cc77c02b68b66be2951 (patch) | |
| tree | fa50e5aef35329147ed2cb5a32349bb55d62a8a4 /chrome | |
| parent | e4d1395aee2275904c4314d8ddad807d77eebce2 (diff) | |
| download | chromium_src-c247cab7f2cf58a73b646cc77c02b68b66be2951.zip chromium_src-c247cab7f2cf58a73b646cc77c02b68b66be2951.tar.gz chromium_src-c247cab7f2cf58a73b646cc77c02b68b66be2951.tar.bz2 | |
Fix crash in PluginService if the keys are null. It's still unclear why this is happening now as opposed to before. This change just fixes the crash in the meantime.
BUG=70317
Review URL: http://codereview.chromium.org/6313007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/plugin_service.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index fbb2fae..b9774e8 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -218,8 +218,10 @@ PluginService::~PluginService() { // Release the events since they're owned by RegKey, not WaitableEvent. hkcu_watcher_.StopWatching(); hklm_watcher_.StopWatching(); - hkcu_event_->Release(); - hklm_event_->Release(); + if (hkcu_event_.get()) + hkcu_event_->Release(); + if (hklm_event_.get()) + hklm_event_->Release(); #endif } |