diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 20:01:47 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 20:01:47 +0000 |
| commit | 79f0fa75f75e4280240927ef8b98192854350f87 (patch) | |
| tree | 8a9bc9aca8e1b7eeaae3bc41b03ef59c4d64e0f4 /chrome/browser/plugin_service.cc | |
| parent | c5c2062946d64b8b8f56c78bca4addb1d8269715 (diff) | |
| download | chromium_src-79f0fa75f75e4280240927ef8b98192854350f87.zip chromium_src-79f0fa75f75e4280240927ef8b98192854350f87.tar.gz chromium_src-79f0fa75f75e4280240927ef8b98192854350f87.tar.bz2 | |
Fix crash when actual_mime_type is NULL.
Review URL: http://codereview.chromium.org/6379014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.cc')
| -rw-r--r-- | chrome/browser/plugin_service.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index 534773a..09775e9 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -371,7 +371,8 @@ bool PluginService::GetFirstAllowedPluginInfo( if (overridden_plugins_[i].render_process_id == render_process_id && overridden_plugins_[i].render_view_id == render_view_id && overridden_plugins_[i].url == url) { - *actual_mime_type = mime_type; + if (actual_mime_type) + *actual_mime_type = mime_type; *info = overridden_plugins_[i].plugin; return true; } |