From 79f0fa75f75e4280240927ef8b98192854350f87 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Thu, 27 Jan 2011 20:01:47 +0000 Subject: 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 --- chrome/browser/plugin_service.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome') 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; } -- cgit v1.1