From 121b0cf4517156d0ac5111caf9830c51b69bae8f Mon Sep 17 00:00:00 2001
From: Derek Sollenberger <djsollen@google.com>
Date: Wed, 11 May 2011 09:01:45 -0400
Subject: Add null pointer check when searching for a plugin widget.

bug: 4395730
Change-Id: I4fb5c129084a8f1d1e3f3951c9cac77a0df4d296
---
 WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'WebKit/android')

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 535c0da..946a4a7 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -1120,7 +1120,7 @@ public:
             for (; it != end; ++it) {
                 Widget* widget = (*it)->widget();
                 // PluginWidget is used only with PluginToggleWidget
-                if (widget->isPluginViewBase()) {
+                if (widget && widget->isPluginViewBase()) {
                     PluginToggleWidget* ptw =
                             static_cast<PluginToggleWidget*>(widget);
                     ptw->swapPlugin(*it);
-- 
cgit v1.1