Merge change 3201

* changes:
  Fix a crash on missing plugins.

1 files changed, 8 insertions, 4 deletions

diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index 4dc361e..3c765ec 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -146,9 +146,13 @@ void PluginWidgetAndroid::draw(SkCanvas* canvas) {
 bool PluginWidgetAndroid::sendEvent(const ANPEvent& evt) {
     WebCore::PluginPackage* pkg = m_pluginView->plugin();
     NPP instance = m_pluginView->instance();
-    // make a localCopy since the actual plugin may not respect its constness,
-    // and so we don't want our caller to have its param modified
-    ANPEvent localCopy = evt;
-    return pkg->pluginFuncs()->event(instance, &localCopy);
+    // "missing" plugins won't have these
+    if (pkg && instance) {
+        // make a localCopy since the actual plugin may not respect its constness,
+        // and so we don't want our caller to have its param modified
+        ANPEvent localCopy = evt;
+        return pkg->pluginFuncs()->event(instance, &localCopy);
+    }
+    return false;
 }