diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 19:26:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 19:26:52 +0000 |
| commit | c309e216982bbd2aecf29bbd16d873970d779757 (patch) | |
| tree | 4d74f95f26d56d05303402eae25dc83df129f1cf /chrome | |
| parent | 6043ad6b37b7f21834bbb9595ce88660967dba22 (diff) | |
| download | chromium_src-c309e216982bbd2aecf29bbd16d873970d779757.zip chromium_src-c309e216982bbd2aecf29bbd16d873970d779757.tar.gz chromium_src-c309e216982bbd2aecf29bbd16d873970d779757.tar.bz2 | |
Pepper: leak the plugin registry
Leaking this is better than poking into bad memory on shutdown.
BUG=63234
Review URL: http://codereview.chromium.org/5556002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/pepper_plugin_registry.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/common/pepper_plugin_registry.cc b/chrome/common/pepper_plugin_registry.cc index f812afd..60668f2 100644 --- a/chrome/common/pepper_plugin_registry.cc +++ b/chrome/common/pepper_plugin_registry.cc @@ -30,8 +30,12 @@ PepperPluginInfo::~PepperPluginInfo() {} // static PepperPluginRegistry* PepperPluginRegistry::GetInstance() { - static PepperPluginRegistry registry; - return ®istry; + static PepperPluginRegistry* registry = NULL; + // This object leaks. It is a temporary hack to work around a crash. + // http://code.google.com/p/chromium/issues/detail?id=63234 + if (!registry) + registry = new PepperPluginRegistry; + return registry; } // static |