diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 23:51:08 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 23:51:08 +0000 |
| commit | ad245ab2641b50353bff88901da5647b8b27defa (patch) | |
| tree | 820501adf74862b63dfa9b0762ec052eb5e664c9 | |
| parent | 81708681e34b50a58e00162d8553102ca5794d7f (diff) | |
| download | chromium_src-ad245ab2641b50353bff88901da5647b8b27defa.zip chromium_src-ad245ab2641b50353bff88901da5647b8b27defa.tar.gz chromium_src-ad245ab2641b50353bff88901da5647b8b27defa.tar.bz2 | |
[Mac] Puts a NULL check in case a native plugin library cannot be loaded (.dll on mac, for example).
TEST=Load an extension that requires a .dll or other platform-specific file and make sure it does not crash the browser.
BUG=29584
Review URL: http://codereview.chromium.org/492012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34308 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/plugins/plugin_lib_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/plugins/plugin_lib_mac.mm b/webkit/glue/plugins/plugin_lib_mac.mm index a29a6f7..9f4d1dd 100644 --- a/webkit/glue/plugins/plugin_lib_mac.mm +++ b/webkit/glue/plugins/plugin_lib_mac.mm @@ -311,7 +311,7 @@ bool PluginLib::ReadWebPluginInfo(const FilePath &filename, // not leaked. scoped_ptr<base::NativeLibraryStruct> native_library( base::LoadNativeLibrary(filename)); - if (native_library->type != base::BUNDLE) + if (!native_library.get() || native_library->type != base::BUNDLE) return false; scoped_cftyperef<CFBundleRef> bundle(native_library->bundle); if (!bundle) |