diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-05-11 09:01:45 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2011-05-11 09:01:45 -0400 |
| commit | 121b0cf4517156d0ac5111caf9830c51b69bae8f (patch) | |
| tree | 3b6aeed09305fbe4b3cc378f46410108fa553c21 | |
| parent | 395be1d91445ddb4a06255a2de6b2f0d4151e507 (diff) | |
| download | external_webkit-121b0cf4517156d0ac5111caf9830c51b69bae8f.zip external_webkit-121b0cf4517156d0ac5111caf9830c51b69bae8f.tar.gz external_webkit-121b0cf4517156d0ac5111caf9830c51b69bae8f.tar.bz2 | |
Add null pointer check when searching for a plugin widget.
bug: 4395730
Change-Id: I4fb5c129084a8f1d1e3f3951c9cac77a0df4d296
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |